blob: 4ee673994be6d4dca177dc054cb8a6bc6ed1f253 [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
Han-Wen Nienhuys8b41a972007-05-23 18:20:53 -030025
Brandon Caseya235e852013-01-26 11:14:33 -080026try:
27 from subprocess import CalledProcessError
28except ImportError:
29 # from python2.7:subprocess.py
30 # Exception classes used by this module.
31 class CalledProcessError(Exception):
32 """This exception is raised when a process run by check_call() returns
33 a non-zero exit status. The exit status will be stored in the
34 returncode attribute."""
35 def __init__(self, returncode, cmd):
36 self.returncode = returncode
37 self.cmd = cmd
38 def __str__(self):
39 return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode)
40
Han-Wen Nienhuys4addad22007-05-23 18:49:35 -030041verbose = False
Simon Hausmann86949ee2007-03-19 20:59:12 +010042
Luke Diamand06804c72012-04-11 17:21:24 +020043# Only labels/tags matching this will be imported/exported
Luke Diamandc8942a22012-04-11 17:21:24 +020044defaultLabelRegexp = r'[a-zA-Z0-9_\-.]+$'
Anand Kumria21a50752008-08-10 19:26:28 +010045
46def p4_build_cmd(cmd):
47 """Build a suitable p4 command line.
48
49 This consolidates building and returning a p4 command line into one
50 location. It means that hooking into the environment, or other configuration
51 can be done more easily.
52 """
Luke Diamand6de040d2011-10-16 10:47:52 -040053 real_cmd = ["p4"]
Anand Kumriaabcaf072008-08-10 19:26:31 +010054
55 user = gitConfig("git-p4.user")
56 if len(user) > 0:
Luke Diamand6de040d2011-10-16 10:47:52 -040057 real_cmd += ["-u",user]
Anand Kumriaabcaf072008-08-10 19:26:31 +010058
59 password = gitConfig("git-p4.password")
60 if len(password) > 0:
Luke Diamand6de040d2011-10-16 10:47:52 -040061 real_cmd += ["-P", password]
Anand Kumriaabcaf072008-08-10 19:26:31 +010062
63 port = gitConfig("git-p4.port")
64 if len(port) > 0:
Luke Diamand6de040d2011-10-16 10:47:52 -040065 real_cmd += ["-p", port]
Anand Kumriaabcaf072008-08-10 19:26:31 +010066
67 host = gitConfig("git-p4.host")
68 if len(host) > 0:
Russell Myers41799aa2012-02-22 11:16:05 -080069 real_cmd += ["-H", host]
Anand Kumriaabcaf072008-08-10 19:26:31 +010070
71 client = gitConfig("git-p4.client")
72 if len(client) > 0:
Luke Diamand6de040d2011-10-16 10:47:52 -040073 real_cmd += ["-c", client]
Anand Kumriaabcaf072008-08-10 19:26:31 +010074
Luke Diamand6de040d2011-10-16 10:47:52 -040075
76 if isinstance(cmd,basestring):
77 real_cmd = ' '.join(real_cmd) + ' ' + cmd
78 else:
79 real_cmd += cmd
Anand Kumria21a50752008-08-10 19:26:28 +010080 return real_cmd
81
Miklós Fazekasbbd84862013-03-11 17:45:29 -040082def chdir(path, is_client_path=False):
83 """Do chdir to the given path, and set the PWD environment
84 variable for use by P4. It does not look at getcwd() output.
85 Since we're not using the shell, it is necessary to set the
86 PWD environment variable explicitly.
87
88 Normally, expand the path to force it to be absolute. This
89 addresses the use of relative path names inside P4 settings,
90 e.g. P4CONFIG=.p4config. P4 does not simply open the filename
91 as given; it looks for .p4config using PWD.
92
93 If is_client_path, the path was handed to us directly by p4,
94 and may be a symbolic link. Do not call os.getcwd() in this
95 case, because it will cause p4 to think that PWD is not inside
96 the client path.
97 """
98
99 os.chdir(path)
100 if not is_client_path:
101 path = os.getcwd()
102 os.environ['PWD'] = path
Robert Blum053fd0c2008-08-01 12:50:03 -0700103
Han-Wen Nienhuys86dff6b2007-05-23 18:49:35 -0300104def die(msg):
105 if verbose:
106 raise Exception(msg)
107 else:
108 sys.stderr.write(msg + "\n")
109 sys.exit(1)
110
Luke Diamand6de040d2011-10-16 10:47:52 -0400111def write_pipe(c, stdin):
Han-Wen Nienhuys4addad22007-05-23 18:49:35 -0300112 if verbose:
Luke Diamand6de040d2011-10-16 10:47:52 -0400113 sys.stderr.write('Writing pipe: %s\n' % str(c))
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300114
Luke Diamand6de040d2011-10-16 10:47:52 -0400115 expand = isinstance(c,basestring)
116 p = subprocess.Popen(c, stdin=subprocess.PIPE, shell=expand)
117 pipe = p.stdin
118 val = pipe.write(stdin)
119 pipe.close()
120 if p.wait():
121 die('Command failed: %s' % str(c))
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300122
123 return val
124
Luke Diamand6de040d2011-10-16 10:47:52 -0400125def p4_write_pipe(c, stdin):
Anand Kumriad9429192008-08-14 23:40:38 +0100126 real_cmd = p4_build_cmd(c)
Luke Diamand6de040d2011-10-16 10:47:52 -0400127 return write_pipe(real_cmd, stdin)
Anand Kumriad9429192008-08-14 23:40:38 +0100128
Han-Wen Nienhuys4addad22007-05-23 18:49:35 -0300129def read_pipe(c, ignore_error=False):
130 if verbose:
Luke Diamand6de040d2011-10-16 10:47:52 -0400131 sys.stderr.write('Reading pipe: %s\n' % str(c))
Han-Wen Nienhuys8b41a972007-05-23 18:20:53 -0300132
Luke Diamand6de040d2011-10-16 10:47:52 -0400133 expand = isinstance(c,basestring)
134 p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand)
135 pipe = p.stdout
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300136 val = pipe.read()
Luke Diamand6de040d2011-10-16 10:47:52 -0400137 if p.wait() and not ignore_error:
138 die('Command failed: %s' % str(c))
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300139
140 return val
141
Anand Kumriad9429192008-08-14 23:40:38 +0100142def p4_read_pipe(c, ignore_error=False):
143 real_cmd = p4_build_cmd(c)
144 return read_pipe(real_cmd, ignore_error)
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300145
Han-Wen Nienhuysbce4c5f2007-05-23 17:14:33 -0300146def read_pipe_lines(c):
Han-Wen Nienhuys4addad22007-05-23 18:49:35 -0300147 if verbose:
Luke Diamand6de040d2011-10-16 10:47:52 -0400148 sys.stderr.write('Reading pipe: %s\n' % str(c))
149
150 expand = isinstance(c, basestring)
151 p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand)
152 pipe = p.stdout
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300153 val = pipe.readlines()
Luke Diamand6de040d2011-10-16 10:47:52 -0400154 if pipe.close() or p.wait():
155 die('Command failed: %s' % str(c))
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300156
157 return val
Simon Hausmanncaace112007-05-15 14:57:57 +0200158
Anand Kumria23181212008-08-10 19:26:24 +0100159def p4_read_pipe_lines(c):
160 """Specifically invoke p4 on the command supplied. """
Anand Kumria155af832008-08-10 19:26:30 +0100161 real_cmd = p4_build_cmd(c)
Anand Kumria23181212008-08-10 19:26:24 +0100162 return read_pipe_lines(real_cmd)
163
Gary Gibbons8e9497c2012-07-12 19:29:00 -0400164def p4_has_command(cmd):
165 """Ask p4 for help on this command. If it returns an error, the
166 command does not exist in this version of p4."""
167 real_cmd = p4_build_cmd(["help", cmd])
168 p = subprocess.Popen(real_cmd, stdout=subprocess.PIPE,
169 stderr=subprocess.PIPE)
170 p.communicate()
171 return p.returncode == 0
172
Pete Wyckoff249da4c2012-11-23 17:35:35 -0500173def p4_has_move_command():
174 """See if the move command exists, that it supports -k, and that
175 it has not been administratively disabled. The arguments
176 must be correct, but the filenames do not have to exist. Use
177 ones with wildcards so even if they exist, it will fail."""
178
179 if not p4_has_command("move"):
180 return False
181 cmd = p4_build_cmd(["move", "-k", "@from", "@to"])
182 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
183 (out, err) = p.communicate()
184 # return code will be 1 in either case
185 if err.find("Invalid option") >= 0:
186 return False
187 if err.find("disabled") >= 0:
188 return False
189 # assume it failed because @... was invalid changelist
190 return True
191
Han-Wen Nienhuys6754a292007-05-23 17:41:50 -0300192def system(cmd):
Luke Diamand6de040d2011-10-16 10:47:52 -0400193 expand = isinstance(cmd,basestring)
Han-Wen Nienhuys4addad22007-05-23 18:49:35 -0300194 if verbose:
Luke Diamand6de040d2011-10-16 10:47:52 -0400195 sys.stderr.write("executing %s\n" % str(cmd))
Brandon Caseya235e852013-01-26 11:14:33 -0800196 retcode = subprocess.call(cmd, shell=expand)
197 if retcode:
198 raise CalledProcessError(retcode, cmd)
Han-Wen Nienhuys6754a292007-05-23 17:41:50 -0300199
Anand Kumriabf9320f2008-08-10 19:26:26 +0100200def p4_system(cmd):
201 """Specifically invoke p4 as the system command. """
Anand Kumria155af832008-08-10 19:26:30 +0100202 real_cmd = p4_build_cmd(cmd)
Luke Diamand6de040d2011-10-16 10:47:52 -0400203 expand = isinstance(real_cmd, basestring)
Brandon Caseya235e852013-01-26 11:14:33 -0800204 retcode = subprocess.call(real_cmd, shell=expand)
205 if retcode:
206 raise CalledProcessError(retcode, real_cmd)
Luke Diamand6de040d2011-10-16 10:47:52 -0400207
Pete Wyckoff7f0e5962013-01-26 22:11:13 -0500208_p4_version_string = None
209def p4_version_string():
210 """Read the version string, showing just the last line, which
211 hopefully is the interesting version bit.
212
213 $ p4 -V
214 Perforce - The Fast Software Configuration Management System.
215 Copyright 1995-2011 Perforce Software. All rights reserved.
216 Rev. P4/NTX86/2011.1/393975 (2011/12/16).
217 """
218 global _p4_version_string
219 if not _p4_version_string:
220 a = p4_read_pipe_lines(["-V"])
221 _p4_version_string = a[-1].rstrip()
222 return _p4_version_string
223
Luke Diamand6de040d2011-10-16 10:47:52 -0400224def p4_integrate(src, dest):
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400225 p4_system(["integrate", "-Dt", wildcard_encode(src), wildcard_encode(dest)])
Luke Diamand6de040d2011-10-16 10:47:52 -0400226
Pete Wyckoff8d7ec362012-04-29 20:57:14 -0400227def p4_sync(f, *options):
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400228 p4_system(["sync"] + list(options) + [wildcard_encode(f)])
Luke Diamand6de040d2011-10-16 10:47:52 -0400229
230def p4_add(f):
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400231 # forcibly add file names with wildcards
232 if wildcard_present(f):
233 p4_system(["add", "-f", f])
234 else:
235 p4_system(["add", f])
Luke Diamand6de040d2011-10-16 10:47:52 -0400236
237def p4_delete(f):
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400238 p4_system(["delete", wildcard_encode(f)])
Luke Diamand6de040d2011-10-16 10:47:52 -0400239
240def p4_edit(f):
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400241 p4_system(["edit", wildcard_encode(f)])
Luke Diamand6de040d2011-10-16 10:47:52 -0400242
243def p4_revert(f):
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400244 p4_system(["revert", wildcard_encode(f)])
Luke Diamand6de040d2011-10-16 10:47:52 -0400245
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400246def p4_reopen(type, f):
247 p4_system(["reopen", "-t", type, wildcard_encode(f)])
Anand Kumriabf9320f2008-08-10 19:26:26 +0100248
Gary Gibbons8e9497c2012-07-12 19:29:00 -0400249def p4_move(src, dest):
250 p4_system(["move", "-k", wildcard_encode(src), wildcard_encode(dest)])
251
Pete Wyckoff18fa13d2012-11-23 17:35:34 -0500252def p4_describe(change):
253 """Make sure it returns a valid result by checking for
254 the presence of field "time". Return a dict of the
255 results."""
256
257 ds = p4CmdList(["describe", "-s", str(change)])
258 if len(ds) != 1:
259 die("p4 describe -s %d did not return 1 result: %s" % (change, str(ds)))
260
261 d = ds[0]
262
263 if "p4ExitCode" in d:
264 die("p4 describe -s %d exited with %d: %s" % (change, d["p4ExitCode"],
265 str(d)))
266 if "code" in d:
267 if d["code"] == "error":
268 die("p4 describe -s %d returned error code: %s" % (change, str(d)))
269
270 if "time" not in d:
271 die("p4 describe -s %d returned no \"time\": %s" % (change, str(d)))
272
273 return d
274
Pete Wyckoff9cffb8c2011-10-16 10:45:01 -0400275#
276# Canonicalize the p4 type and return a tuple of the
277# base type, plus any modifiers. See "p4 help filetypes"
278# for a list and explanation.
279#
280def split_p4_type(p4type):
David Brownb9fc6ea2007-09-19 13:12:48 -0700281
Pete Wyckoff9cffb8c2011-10-16 10:45:01 -0400282 p4_filetypes_historical = {
283 "ctempobj": "binary+Sw",
284 "ctext": "text+C",
285 "cxtext": "text+Cx",
286 "ktext": "text+k",
287 "kxtext": "text+kx",
288 "ltext": "text+F",
289 "tempobj": "binary+FSw",
290 "ubinary": "binary+F",
291 "uresource": "resource+F",
292 "uxbinary": "binary+Fx",
293 "xbinary": "binary+x",
294 "xltext": "text+Fx",
295 "xtempobj": "binary+Swx",
296 "xtext": "text+x",
297 "xunicode": "unicode+x",
298 "xutf16": "utf16+x",
299 }
300 if p4type in p4_filetypes_historical:
301 p4type = p4_filetypes_historical[p4type]
302 mods = ""
303 s = p4type.split("+")
304 base = s[0]
305 mods = ""
306 if len(s) > 1:
307 mods = s[1]
308 return (base, mods)
309
Luke Diamand60df0712012-02-23 07:51:30 +0000310#
311# return the raw p4 type of a file (text, text+ko, etc)
312#
Pete Wyckoff79467e62014-01-21 18:16:45 -0500313def p4_type(f):
314 results = p4CmdList(["fstat", "-T", "headType", wildcard_encode(f)])
Luke Diamand60df0712012-02-23 07:51:30 +0000315 return results[0]['headType']
316
317#
318# Given a type base and modifier, return a regexp matching
319# the keywords that can be expanded in the file
320#
321def p4_keywords_regexp_for_type(base, type_mods):
322 if base in ("text", "unicode", "binary"):
323 kwords = None
324 if "ko" in type_mods:
325 kwords = 'Id|Header'
326 elif "k" in type_mods:
327 kwords = 'Id|Header|Author|Date|DateTime|Change|File|Revision'
328 else:
329 return None
330 pattern = r"""
331 \$ # Starts with a dollar, followed by...
332 (%s) # one of the keywords, followed by...
Pete Wyckoff6b2bf412012-11-04 17:04:02 -0500333 (:[^$\n]+)? # possibly an old expansion, followed by...
Luke Diamand60df0712012-02-23 07:51:30 +0000334 \$ # another dollar
335 """ % kwords
336 return pattern
337 else:
338 return None
339
340#
341# Given a file, return a regexp matching the possible
342# RCS keywords that will be expanded, or None for files
343# with kw expansion turned off.
344#
345def p4_keywords_regexp_for_file(file):
346 if not os.path.exists(file):
347 return None
348 else:
349 (type_base, type_mods) = split_p4_type(p4_type(file))
350 return p4_keywords_regexp_for_type(type_base, type_mods)
David Brownb9fc6ea2007-09-19 13:12:48 -0700351
Chris Pettittc65b6702007-11-01 20:43:14 -0700352def setP4ExecBit(file, mode):
353 # Reopens an already open file and changes the execute bit to match
354 # the execute bit setting in the passed in mode.
355
356 p4Type = "+x"
357
358 if not isModeExec(mode):
359 p4Type = getP4OpenedType(file)
360 p4Type = re.sub('^([cku]?)x(.*)', '\\1\\2', p4Type)
361 p4Type = re.sub('(.*?\+.*?)x(.*?)', '\\1\\2', p4Type)
362 if p4Type[-1] == "+":
363 p4Type = p4Type[0:-1]
364
Luke Diamand6de040d2011-10-16 10:47:52 -0400365 p4_reopen(p4Type, file)
Chris Pettittc65b6702007-11-01 20:43:14 -0700366
367def getP4OpenedType(file):
368 # Returns the perforce file type for the given file.
369
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400370 result = p4_read_pipe(["opened", wildcard_encode(file)])
Marius Storm-Olsenf3e5ae42008-03-28 15:40:40 +0100371 match = re.match(".*\((.+)\)\r?$", result)
Chris Pettittc65b6702007-11-01 20:43:14 -0700372 if match:
373 return match.group(1)
374 else:
Marius Storm-Olsenf3e5ae42008-03-28 15:40:40 +0100375 die("Could not determine file type for %s (result: '%s')" % (file, result))
Chris Pettittc65b6702007-11-01 20:43:14 -0700376
Luke Diamand06804c72012-04-11 17:21:24 +0200377# Return the set of all p4 labels
378def getP4Labels(depotPaths):
379 labels = set()
380 if isinstance(depotPaths,basestring):
381 depotPaths = [depotPaths]
382
383 for l in p4CmdList(["labels"] + ["%s..." % p for p in depotPaths]):
384 label = l['label']
385 labels.add(label)
386
387 return labels
388
389# Return the set of all git tags
390def getGitTags():
391 gitTags = set()
392 for line in read_pipe_lines(["git", "tag"]):
393 tag = line.strip()
394 gitTags.add(tag)
395 return gitTags
396
Chris Pettittb43b0a32007-11-01 20:43:13 -0700397def diffTreePattern():
398 # This is a simple generator for the diff tree regex pattern. This could be
399 # a class variable if this and parseDiffTreeEntry were a part of a class.
400 pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)')
401 while True:
402 yield pattern
403
404def parseDiffTreeEntry(entry):
405 """Parses a single diff tree entry into its component elements.
406
407 See git-diff-tree(1) manpage for details about the format of the diff
408 output. This method returns a dictionary with the following elements:
409
410 src_mode - The mode of the source file
411 dst_mode - The mode of the destination file
412 src_sha1 - The sha1 for the source file
413 dst_sha1 - The sha1 fr the destination file
414 status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc)
415 status_score - The score for the status (applicable for 'C' and 'R'
416 statuses). This is None if there is no score.
417 src - The path for the source file.
418 dst - The path for the destination file. This is only present for
419 copy or renames. If it is not present, this is None.
420
421 If the pattern is not matched, None is returned."""
422
423 match = diffTreePattern().next().match(entry)
424 if match:
425 return {
426 'src_mode': match.group(1),
427 'dst_mode': match.group(2),
428 'src_sha1': match.group(3),
429 'dst_sha1': match.group(4),
430 'status': match.group(5),
431 'status_score': match.group(6),
432 'src': match.group(7),
433 'dst': match.group(10)
434 }
435 return None
436
Chris Pettittc65b6702007-11-01 20:43:14 -0700437def isModeExec(mode):
438 # Returns True if the given git mode represents an executable file,
439 # otherwise False.
440 return mode[-3:] == "755"
441
442def isModeExecChanged(src_mode, dst_mode):
443 return isModeExec(src_mode) != isModeExec(dst_mode)
444
Luke Diamandb9327052009-07-30 00:13:46 +0100445def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None):
Luke Diamand6de040d2011-10-16 10:47:52 -0400446
447 if isinstance(cmd,basestring):
448 cmd = "-G " + cmd
449 expand = True
450 else:
451 cmd = ["-G"] + cmd
452 expand = False
453
454 cmd = p4_build_cmd(cmd)
Han-Wen Nienhuys6a49f8e2007-05-23 18:49:35 -0300455 if verbose:
Luke Diamand6de040d2011-10-16 10:47:52 -0400456 sys.stderr.write("Opening pipe: %s\n" % str(cmd))
Scott Lamb9f90c732007-07-15 20:58:10 -0700457
458 # Use a temporary file to avoid deadlocks without
459 # subprocess.communicate(), which would put another copy
460 # of stdout into memory.
461 stdin_file = None
462 if stdin is not None:
463 stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode)
Luke Diamand6de040d2011-10-16 10:47:52 -0400464 if isinstance(stdin,basestring):
465 stdin_file.write(stdin)
466 else:
467 for i in stdin:
468 stdin_file.write(i + '\n')
Scott Lamb9f90c732007-07-15 20:58:10 -0700469 stdin_file.flush()
470 stdin_file.seek(0)
471
Luke Diamand6de040d2011-10-16 10:47:52 -0400472 p4 = subprocess.Popen(cmd,
473 shell=expand,
Scott Lamb9f90c732007-07-15 20:58:10 -0700474 stdin=stdin_file,
475 stdout=subprocess.PIPE)
Simon Hausmann86949ee2007-03-19 20:59:12 +0100476
477 result = []
478 try:
479 while True:
Scott Lamb9f90c732007-07-15 20:58:10 -0700480 entry = marshal.load(p4.stdout)
Andrew Garberc3f61632011-04-07 02:01:21 -0400481 if cb is not None:
482 cb(entry)
483 else:
484 result.append(entry)
Simon Hausmann86949ee2007-03-19 20:59:12 +0100485 except EOFError:
486 pass
Scott Lamb9f90c732007-07-15 20:58:10 -0700487 exitCode = p4.wait()
488 if exitCode != 0:
Simon Hausmannac3e0d72007-05-23 23:32:32 +0200489 entry = {}
490 entry["p4ExitCode"] = exitCode
491 result.append(entry)
Simon Hausmann86949ee2007-03-19 20:59:12 +0100492
493 return result
494
495def p4Cmd(cmd):
496 list = p4CmdList(cmd)
497 result = {}
498 for entry in list:
499 result.update(entry)
500 return result;
501
Simon Hausmanncb2c9db2007-03-24 09:15:11 +0100502def p4Where(depotPath):
503 if not depotPath.endswith("/"):
504 depotPath += "/"
Tor Arvid Lund7f705dc2008-12-04 14:37:33 +0100505 depotPath = depotPath + "..."
Luke Diamand6de040d2011-10-16 10:47:52 -0400506 outputList = p4CmdList(["where", depotPath])
Tor Arvid Lund7f705dc2008-12-04 14:37:33 +0100507 output = None
508 for entry in outputList:
Tor Arvid Lund75bc9572008-12-09 16:41:50 +0100509 if "depotFile" in entry:
510 if entry["depotFile"] == depotPath:
511 output = entry
512 break
513 elif "data" in entry:
514 data = entry.get("data")
515 space = data.find(" ")
516 if data[:space] == depotPath:
517 output = entry
518 break
Tor Arvid Lund7f705dc2008-12-04 14:37:33 +0100519 if output == None:
520 return ""
Simon Hausmanndc524032007-05-21 09:34:56 +0200521 if output["code"] == "error":
522 return ""
Simon Hausmanncb2c9db2007-03-24 09:15:11 +0100523 clientPath = ""
524 if "path" in output:
525 clientPath = output.get("path")
526 elif "data" in output:
527 data = output.get("data")
528 lastSpace = data.rfind(" ")
529 clientPath = data[lastSpace + 1:]
530
531 if clientPath.endswith("..."):
532 clientPath = clientPath[:-3]
533 return clientPath
534
Simon Hausmann86949ee2007-03-19 20:59:12 +0100535def currentGitBranch():
Han-Wen Nienhuysb25b2062007-05-23 18:49:35 -0300536 return read_pipe("git name-rev HEAD").split(" ")[1].strip()
Simon Hausmann86949ee2007-03-19 20:59:12 +0100537
Simon Hausmann4f5cf762007-03-19 22:25:17 +0100538def isValidGitDir(path):
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -0300539 if (os.path.exists(path + "/HEAD")
540 and os.path.exists(path + "/refs") and os.path.exists(path + "/objects")):
Simon Hausmann4f5cf762007-03-19 22:25:17 +0100541 return True;
542 return False
543
Simon Hausmann463e8af2007-05-17 09:13:54 +0200544def parseRevision(ref):
Han-Wen Nienhuysb25b2062007-05-23 18:49:35 -0300545 return read_pipe("git rev-parse %s" % ref).strip()
Simon Hausmann463e8af2007-05-17 09:13:54 +0200546
Pete Wyckoff28755db2011-12-24 21:07:40 -0500547def branchExists(ref):
548 rev = read_pipe(["git", "rev-parse", "-q", "--verify", ref],
549 ignore_error=True)
550 return len(rev) > 0
551
Simon Hausmann6ae8de82007-03-22 21:10:25 +0100552def extractLogMessageFromGitCommit(commit):
553 logMessage = ""
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300554
555 ## fixme: title is first line of commit, not 1st paragraph.
Simon Hausmann6ae8de82007-03-22 21:10:25 +0100556 foundTitle = False
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300557 for log in read_pipe_lines("git cat-file commit %s" % commit):
Simon Hausmann6ae8de82007-03-22 21:10:25 +0100558 if not foundTitle:
559 if len(log) == 1:
Simon Hausmann1c094182007-05-01 23:15:48 +0200560 foundTitle = True
Simon Hausmann6ae8de82007-03-22 21:10:25 +0100561 continue
562
563 logMessage += log
564 return logMessage
565
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -0300566def extractSettingsGitLog(log):
Simon Hausmann6ae8de82007-03-22 21:10:25 +0100567 values = {}
568 for line in log.split("\n"):
569 line = line.strip()
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -0300570 m = re.search (r"^ *\[git-p4: (.*)\]$", line)
571 if not m:
572 continue
Simon Hausmann6ae8de82007-03-22 21:10:25 +0100573
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -0300574 assignments = m.group(1).split (':')
575 for a in assignments:
576 vals = a.split ('=')
577 key = vals[0].strip()
578 val = ('='.join (vals[1:])).strip()
579 if val.endswith ('\"') and val.startswith('"'):
580 val = val[1:-1]
581
582 values[key] = val
583
Simon Hausmann845b42c2007-06-07 09:19:34 +0200584 paths = values.get("depot-paths")
585 if not paths:
586 paths = values.get("depot-path")
Simon Hausmanna3fdd572007-06-07 22:54:32 +0200587 if paths:
588 values['depot-paths'] = paths.split(',')
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -0300589 return values
Simon Hausmann6ae8de82007-03-22 21:10:25 +0100590
Simon Hausmann8136a632007-03-22 21:27:14 +0100591def gitBranchExists(branch):
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -0300592 proc = subprocess.Popen(["git", "rev-parse", branch],
593 stderr=subprocess.PIPE, stdout=subprocess.PIPE);
Simon Hausmanncaace112007-05-15 14:57:57 +0200594 return proc.wait() == 0;
Simon Hausmann8136a632007-03-22 21:27:14 +0100595
John Chapman36bd8442008-11-08 14:22:49 +1100596_gitConfig = {}
Pete Wyckoffb345d6c2013-01-26 22:11:23 -0500597
Pete Wyckoff0d609032013-01-26 22:11:24 -0500598def gitConfig(key):
John Chapman36bd8442008-11-08 14:22:49 +1100599 if not _gitConfig.has_key(key):
Pete Wyckoff0d609032013-01-26 22:11:24 -0500600 cmd = [ "git", "config", key ]
Pete Wyckoffb345d6c2013-01-26 22:11:23 -0500601 s = read_pipe(cmd, ignore_error=True)
602 _gitConfig[key] = s.strip()
John Chapman36bd8442008-11-08 14:22:49 +1100603 return _gitConfig[key]
Simon Hausmann01265102007-05-25 10:36:10 +0200604
Pete Wyckoff0d609032013-01-26 22:11:24 -0500605def gitConfigBool(key):
606 """Return a bool, using git config --bool. It is True only if the
607 variable is set to true, and False if set to false or not present
608 in the config."""
609
610 if not _gitConfig.has_key(key):
611 cmd = [ "git", "config", "--bool", key ]
612 s = read_pipe(cmd, ignore_error=True)
613 v = s.strip()
614 _gitConfig[key] = v == "true"
Simon Hausmann062410b2007-07-18 10:56:31 +0200615 return _gitConfig[key]
616
Vitor Antunes7199cf12011-08-19 00:44:05 +0100617def gitConfigList(key):
618 if not _gitConfig.has_key(key):
Pete Wyckoff2abba302013-01-26 22:11:22 -0500619 s = read_pipe(["git", "config", "--get-all", key], ignore_error=True)
620 _gitConfig[key] = s.strip().split(os.linesep)
Vitor Antunes7199cf12011-08-19 00:44:05 +0100621 return _gitConfig[key]
622
Pete Wyckoff2c8037e2013-01-14 19:46:57 -0500623def p4BranchesInGit(branchesAreInRemotes=True):
624 """Find all the branches whose names start with "p4/", looking
625 in remotes or heads as specified by the argument. Return
626 a dictionary of { branch: revision } for each one found.
627 The branch names are the short names, without any
628 "p4/" prefix."""
629
Simon Hausmann062410b2007-07-18 10:56:31 +0200630 branches = {}
631
632 cmdline = "git rev-parse --symbolic "
633 if branchesAreInRemotes:
Pete Wyckoff2c8037e2013-01-14 19:46:57 -0500634 cmdline += "--remotes"
Simon Hausmann062410b2007-07-18 10:56:31 +0200635 else:
Pete Wyckoff2c8037e2013-01-14 19:46:57 -0500636 cmdline += "--branches"
Simon Hausmann062410b2007-07-18 10:56:31 +0200637
638 for line in read_pipe_lines(cmdline):
639 line = line.strip()
640
Pete Wyckoff2c8037e2013-01-14 19:46:57 -0500641 # only import to p4/
642 if not line.startswith('p4/'):
Simon Hausmann062410b2007-07-18 10:56:31 +0200643 continue
Pete Wyckoff2c8037e2013-01-14 19:46:57 -0500644 # special symbolic ref to p4/master
645 if line == "p4/HEAD":
646 continue
Simon Hausmann062410b2007-07-18 10:56:31 +0200647
Pete Wyckoff2c8037e2013-01-14 19:46:57 -0500648 # strip off p4/ prefix
649 branch = line[len("p4/"):]
Simon Hausmann062410b2007-07-18 10:56:31 +0200650
651 branches[branch] = parseRevision(line)
Pete Wyckoff2c8037e2013-01-14 19:46:57 -0500652
Simon Hausmann062410b2007-07-18 10:56:31 +0200653 return branches
654
Pete Wyckoff5a8e84c2013-01-14 19:47:05 -0500655def branch_exists(branch):
656 """Make sure that the given ref name really exists."""
657
658 cmd = [ "git", "rev-parse", "--symbolic", "--verify", branch ]
659 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
660 out, _ = p.communicate()
661 if p.returncode:
662 return False
663 # expect exactly one line of output: the branch name
664 return out.rstrip() == branch
665
Simon Hausmann9ceab362007-06-22 00:01:57 +0200666def findUpstreamBranchPoint(head = "HEAD"):
Simon Hausmann86506fe2007-07-18 12:40:12 +0200667 branches = p4BranchesInGit()
668 # map from depot-path to branch name
669 branchByDepotPath = {}
670 for branch in branches.keys():
671 tip = branches[branch]
672 log = extractLogMessageFromGitCommit(tip)
673 settings = extractSettingsGitLog(log)
674 if settings.has_key("depot-paths"):
675 paths = ",".join(settings["depot-paths"])
676 branchByDepotPath[paths] = "remotes/p4/" + branch
677
Simon Hausmann27d2d812007-06-12 14:31:59 +0200678 settings = None
Simon Hausmann27d2d812007-06-12 14:31:59 +0200679 parent = 0
680 while parent < 65535:
Simon Hausmann9ceab362007-06-22 00:01:57 +0200681 commit = head + "~%s" % parent
Simon Hausmann27d2d812007-06-12 14:31:59 +0200682 log = extractLogMessageFromGitCommit(commit)
683 settings = extractSettingsGitLog(log)
Simon Hausmann86506fe2007-07-18 12:40:12 +0200684 if settings.has_key("depot-paths"):
685 paths = ",".join(settings["depot-paths"])
686 if branchByDepotPath.has_key(paths):
687 return [branchByDepotPath[paths], settings]
Simon Hausmann27d2d812007-06-12 14:31:59 +0200688
Simon Hausmann86506fe2007-07-18 12:40:12 +0200689 parent = parent + 1
Simon Hausmann27d2d812007-06-12 14:31:59 +0200690
Simon Hausmann86506fe2007-07-18 12:40:12 +0200691 return ["", settings]
Simon Hausmann27d2d812007-06-12 14:31:59 +0200692
Simon Hausmann5ca44612007-08-24 17:44:16 +0200693def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent=True):
694 if not silent:
695 print ("Creating/updating branch(es) in %s based on origin branch(es)"
696 % localRefPrefix)
697
698 originPrefix = "origin/p4/"
699
700 for line in read_pipe_lines("git rev-parse --symbolic --remotes"):
701 line = line.strip()
702 if (not line.startswith(originPrefix)) or line.endswith("HEAD"):
703 continue
704
705 headName = line[len(originPrefix):]
706 remoteHead = localRefPrefix + headName
707 originHead = line
708
709 original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead))
710 if (not original.has_key('depot-paths')
711 or not original.has_key('change')):
712 continue
713
714 update = False
715 if not gitBranchExists(remoteHead):
716 if verbose:
717 print "creating %s" % remoteHead
718 update = True
719 else:
720 settings = extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead))
721 if settings.has_key('change') > 0:
722 if settings['depot-paths'] == original['depot-paths']:
723 originP4Change = int(original['change'])
724 p4Change = int(settings['change'])
725 if originP4Change > p4Change:
726 print ("%s (%s) is newer than %s (%s). "
727 "Updating p4 branch from origin."
728 % (originHead, originP4Change,
729 remoteHead, p4Change))
730 update = True
731 else:
732 print ("Ignoring: %s was imported from %s while "
733 "%s was imported from %s"
734 % (originHead, ','.join(original['depot-paths']),
735 remoteHead, ','.join(settings['depot-paths'])))
736
737 if update:
738 system("git update-ref %s %s" % (remoteHead, originHead))
739
740def originP4BranchesExist():
741 return gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
742
Simon Hausmann4f6432d2007-08-26 15:56:36 +0200743def p4ChangesForPaths(depotPaths, changeRange):
744 assert depotPaths
Luke Diamand6de040d2011-10-16 10:47:52 -0400745 cmd = ['changes']
746 for p in depotPaths:
747 cmd += ["%s...%s" % (p, changeRange)]
748 output = p4_read_pipe_lines(cmd)
Simon Hausmann4f6432d2007-08-26 15:56:36 +0200749
Pete Wyckoffb4b0ba02009-02-18 13:12:14 -0500750 changes = {}
Simon Hausmann4f6432d2007-08-26 15:56:36 +0200751 for line in output:
Andrew Garberc3f61632011-04-07 02:01:21 -0400752 changeNum = int(line.split(" ")[1])
753 changes[changeNum] = True
Simon Hausmann4f6432d2007-08-26 15:56:36 +0200754
Pete Wyckoffb4b0ba02009-02-18 13:12:14 -0500755 changelist = changes.keys()
756 changelist.sort()
757 return changelist
Simon Hausmann4f6432d2007-08-26 15:56:36 +0200758
Tor Arvid Lundd53de8b2011-03-15 13:08:02 +0100759def p4PathStartsWith(path, prefix):
760 # This method tries to remedy a potential mixed-case issue:
761 #
762 # If UserA adds //depot/DirA/file1
763 # and UserB adds //depot/dira/file2
764 #
765 # we may or may not have a problem. If you have core.ignorecase=true,
766 # we treat DirA and dira as the same directory
Pete Wyckoff0d609032013-01-26 22:11:24 -0500767 if gitConfigBool("core.ignorecase"):
Tor Arvid Lundd53de8b2011-03-15 13:08:02 +0100768 return path.lower().startswith(prefix.lower())
769 return path.startswith(prefix)
770
Pete Wyckoff543987b2012-02-25 20:06:25 -0500771def getClientSpec():
772 """Look at the p4 client spec, create a View() object that contains
773 all the mappings, and return it."""
774
775 specList = p4CmdList("client -o")
776 if len(specList) != 1:
777 die('Output from "client -o" is %d lines, expecting 1' %
778 len(specList))
779
780 # dictionary of all client parameters
781 entry = specList[0]
782
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +0900783 # the //client/ name
784 client_name = entry["Client"]
785
Pete Wyckoff543987b2012-02-25 20:06:25 -0500786 # just the keys that start with "View"
787 view_keys = [ k for k in entry.keys() if k.startswith("View") ]
788
789 # hold this new View
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +0900790 view = View(client_name)
Pete Wyckoff543987b2012-02-25 20:06:25 -0500791
792 # append the lines, in order, to the view
793 for view_num in range(len(view_keys)):
794 k = "View%d" % view_num
795 if k not in view_keys:
796 die("Expected view key %s missing" % k)
797 view.append(entry[k])
798
799 return view
800
801def getClientRoot():
802 """Grab the client directory."""
803
804 output = p4CmdList("client -o")
805 if len(output) != 1:
806 die('Output from "client -o" is %d lines, expecting 1' % len(output))
807
808 entry = output[0]
809 if "Root" not in entry:
810 die('Client has no "Root"')
811
812 return entry["Root"]
813
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400814#
815# P4 wildcards are not allowed in filenames. P4 complains
816# if you simply add them, but you can force it with "-f", in
817# which case it translates them into %xx encoding internally.
818#
819def wildcard_decode(path):
820 # Search for and fix just these four characters. Do % last so
821 # that fixing it does not inadvertently create new %-escapes.
822 # Cannot have * in a filename in windows; untested as to
823 # what p4 would do in such a case.
824 if not platform.system() == "Windows":
825 path = path.replace("%2A", "*")
826 path = path.replace("%23", "#") \
827 .replace("%40", "@") \
828 .replace("%25", "%")
829 return path
830
831def wildcard_encode(path):
832 # do % first to avoid double-encoding the %s introduced here
833 path = path.replace("%", "%25") \
834 .replace("*", "%2A") \
835 .replace("#", "%23") \
836 .replace("@", "%40")
837 return path
838
839def wildcard_present(path):
Brandon Casey598354c2013-01-26 11:14:32 -0800840 m = re.search("[*#@%]", path)
841 return m is not None
Pete Wyckoff9d7d4462012-04-29 20:57:17 -0400842
Simon Hausmannb9847332007-03-20 20:54:23 +0100843class Command:
844 def __init__(self):
845 self.usage = "usage: %prog [options]"
Simon Hausmann8910ac02007-03-26 08:18:55 +0200846 self.needsGit = True
Luke Diamand6a10b6a2012-04-24 09:33:23 +0100847 self.verbose = False
Simon Hausmannb9847332007-03-20 20:54:23 +0100848
Luke Diamand3ea2cfd2011-04-21 20:50:23 +0100849class P4UserMap:
850 def __init__(self):
851 self.userMapFromPerforceServer = False
Luke Diamandaffb4742012-01-19 09:52:27 +0000852 self.myP4UserId = None
853
854 def p4UserId(self):
855 if self.myP4UserId:
856 return self.myP4UserId
857
858 results = p4CmdList("user -o")
859 for r in results:
860 if r.has_key('User'):
861 self.myP4UserId = r['User']
862 return r['User']
863 die("Could not find your p4 user id")
864
865 def p4UserIsMe(self, p4User):
866 # return True if the given p4 user is actually me
867 me = self.p4UserId()
868 if not p4User or p4User != me:
869 return False
870 else:
871 return True
Luke Diamand3ea2cfd2011-04-21 20:50:23 +0100872
873 def getUserCacheFilename(self):
874 home = os.environ.get("HOME", os.environ.get("USERPROFILE"))
875 return home + "/.gitp4-usercache.txt"
876
877 def getUserMapFromPerforceServer(self):
878 if self.userMapFromPerforceServer:
879 return
880 self.users = {}
881 self.emails = {}
882
883 for output in p4CmdList("users"):
884 if not output.has_key("User"):
885 continue
886 self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
887 self.emails[output["Email"]] = output["User"]
888
889
890 s = ''
891 for (key, val) in self.users.items():
892 s += "%s\t%s\n" % (key.expandtabs(1), val.expandtabs(1))
893
894 open(self.getUserCacheFilename(), "wb").write(s)
895 self.userMapFromPerforceServer = True
896
897 def loadUserMapFromCache(self):
898 self.users = {}
899 self.userMapFromPerforceServer = False
900 try:
901 cache = open(self.getUserCacheFilename(), "rb")
902 lines = cache.readlines()
903 cache.close()
904 for line in lines:
905 entry = line.strip().split("\t")
906 self.users[entry[0]] = entry[1]
907 except IOError:
908 self.getUserMapFromPerforceServer()
909
Simon Hausmannb9847332007-03-20 20:54:23 +0100910class P4Debug(Command):
Simon Hausmann86949ee2007-03-19 20:59:12 +0100911 def __init__(self):
Simon Hausmann6ae8de82007-03-22 21:10:25 +0100912 Command.__init__(self)
Luke Diamand6a10b6a2012-04-24 09:33:23 +0100913 self.options = []
Simon Hausmannc8c39112007-03-19 21:02:30 +0100914 self.description = "A tool to debug the output of p4 -G."
Simon Hausmann8910ac02007-03-26 08:18:55 +0200915 self.needsGit = False
Simon Hausmann86949ee2007-03-19 20:59:12 +0100916
917 def run(self, args):
Han-Wen Nienhuysb1ce9442007-05-23 18:49:35 -0300918 j = 0
Luke Diamand6de040d2011-10-16 10:47:52 -0400919 for output in p4CmdList(args):
Han-Wen Nienhuysb1ce9442007-05-23 18:49:35 -0300920 print 'Element: %d' % j
921 j += 1
Simon Hausmann86949ee2007-03-19 20:59:12 +0100922 print output
Simon Hausmannb9847332007-03-20 20:54:23 +0100923 return True
Simon Hausmann86949ee2007-03-19 20:59:12 +0100924
Simon Hausmann58346842007-05-21 22:57:06 +0200925class P4RollBack(Command):
926 def __init__(self):
927 Command.__init__(self)
928 self.options = [
Simon Hausmann0c66a782007-05-23 20:07:57 +0200929 optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true")
Simon Hausmann58346842007-05-21 22:57:06 +0200930 ]
931 self.description = "A tool to debug the multi-branch import. Don't use :)"
Simon Hausmann0c66a782007-05-23 20:07:57 +0200932 self.rollbackLocalBranches = False
Simon Hausmann58346842007-05-21 22:57:06 +0200933
934 def run(self, args):
935 if len(args) != 1:
936 return False
937 maxChange = int(args[0])
Simon Hausmann0c66a782007-05-23 20:07:57 +0200938
Simon Hausmannad192f22007-05-23 23:44:19 +0200939 if "p4ExitCode" in p4Cmd("changes -m 1"):
Simon Hausmann66a2f522007-05-23 23:40:48 +0200940 die("Problems executing p4");
941
Simon Hausmann0c66a782007-05-23 20:07:57 +0200942 if self.rollbackLocalBranches:
943 refPrefix = "refs/heads/"
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300944 lines = read_pipe_lines("git rev-parse --symbolic --branches")
Simon Hausmann0c66a782007-05-23 20:07:57 +0200945 else:
946 refPrefix = "refs/remotes/"
Han-Wen Nienhuysb016d392007-05-23 17:10:46 -0300947 lines = read_pipe_lines("git rev-parse --symbolic --remotes")
Simon Hausmann0c66a782007-05-23 20:07:57 +0200948
949 for line in lines:
950 if self.rollbackLocalBranches or (line.startswith("p4/") and line != "p4/HEAD\n"):
Han-Wen Nienhuysb25b2062007-05-23 18:49:35 -0300951 line = line.strip()
952 ref = refPrefix + line
Simon Hausmann58346842007-05-21 22:57:06 +0200953 log = extractLogMessageFromGitCommit(ref)
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -0300954 settings = extractSettingsGitLog(log)
955
956 depotPaths = settings['depot-paths']
957 change = settings['change']
958
Simon Hausmann58346842007-05-21 22:57:06 +0200959 changed = False
Simon Hausmann52102d42007-05-21 23:44:24 +0200960
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -0300961 if len(p4Cmd("changes -m 1 " + ' '.join (['%s...@%s' % (p, maxChange)
962 for p in depotPaths]))) == 0:
Simon Hausmann52102d42007-05-21 23:44:24 +0200963 print "Branch %s did not exist at change %s, deleting." % (ref, maxChange)
964 system("git update-ref -d %s `git rev-parse %s`" % (ref, ref))
965 continue
966
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -0300967 while change and int(change) > maxChange:
Simon Hausmann58346842007-05-21 22:57:06 +0200968 changed = True
Simon Hausmann52102d42007-05-21 23:44:24 +0200969 if self.verbose:
970 print "%s is at %s ; rewinding towards %s" % (ref, change, maxChange)
Simon Hausmann58346842007-05-21 22:57:06 +0200971 system("git update-ref %s \"%s^\"" % (ref, ref))
972 log = extractLogMessageFromGitCommit(ref)
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -0300973 settings = extractSettingsGitLog(log)
974
975
976 depotPaths = settings['depot-paths']
977 change = settings['change']
Simon Hausmann58346842007-05-21 22:57:06 +0200978
979 if changed:
Simon Hausmann52102d42007-05-21 23:44:24 +0200980 print "%s rewound to %s" % (ref, change)
Simon Hausmann58346842007-05-21 22:57:06 +0200981
982 return True
983
Luke Diamand3ea2cfd2011-04-21 20:50:23 +0100984class P4Submit(Command, P4UserMap):
Pete Wyckoff6bbfd132012-09-09 16:16:13 -0400985
986 conflict_behavior_choices = ("ask", "skip", "quit")
987
Simon Hausmann4f5cf762007-03-19 22:25:17 +0100988 def __init__(self):
Simon Hausmannb9847332007-03-20 20:54:23 +0100989 Command.__init__(self)
Luke Diamand3ea2cfd2011-04-21 20:50:23 +0100990 P4UserMap.__init__(self)
Simon Hausmann4f5cf762007-03-19 22:25:17 +0100991 self.options = [
Simon Hausmann4f5cf762007-03-19 22:25:17 +0100992 optparse.make_option("--origin", dest="origin"),
Vitor Antunesae901092011-02-20 01:18:24 +0000993 optparse.make_option("-M", dest="detectRenames", action="store_true"),
Luke Diamand3ea2cfd2011-04-21 20:50:23 +0100994 # preserve the user, requires relevant p4 permissions
995 optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"),
Luke Diamand06804c72012-04-11 17:21:24 +0200996 optparse.make_option("--export-labels", dest="exportLabels", action="store_true"),
Pete Wyckoffef739f02012-09-09 16:16:11 -0400997 optparse.make_option("--dry-run", "-n", dest="dry_run", action="store_true"),
Pete Wyckoff728b7ad2012-09-09 16:16:12 -0400998 optparse.make_option("--prepare-p4-only", dest="prepare_p4_only", action="store_true"),
Pete Wyckoff6bbfd132012-09-09 16:16:13 -0400999 optparse.make_option("--conflict", dest="conflict_behavior",
Pete Wyckoff44e8d262013-01-14 19:47:08 -05001000 choices=self.conflict_behavior_choices),
1001 optparse.make_option("--branch", dest="branch"),
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001002 ]
1003 self.description = "Submit changes from git to the perforce depot."
Simon Hausmannc9b50e62007-03-29 19:15:24 +02001004 self.usage += " [name of git branch to submit into perforce depot]"
Simon Hausmann95124972007-03-23 09:16:07 +01001005 self.origin = ""
Vitor Antunesae901092011-02-20 01:18:24 +00001006 self.detectRenames = False
Pete Wyckoff0d609032013-01-26 22:11:24 -05001007 self.preserveUser = gitConfigBool("git-p4.preserveUser")
Pete Wyckoffef739f02012-09-09 16:16:11 -04001008 self.dry_run = False
Pete Wyckoff728b7ad2012-09-09 16:16:12 -04001009 self.prepare_p4_only = False
Pete Wyckoff6bbfd132012-09-09 16:16:13 -04001010 self.conflict_behavior = None
Marius Storm-Olsenf7baba82007-06-07 14:07:01 +02001011 self.isWindows = (platform.system() == "Windows")
Luke Diamand06804c72012-04-11 17:21:24 +02001012 self.exportLabels = False
Pete Wyckoff249da4c2012-11-23 17:35:35 -05001013 self.p4HasMoveCommand = p4_has_move_command()
Pete Wyckoff44e8d262013-01-14 19:47:08 -05001014 self.branch = None
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001015
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001016 def check(self):
1017 if len(p4CmdList("opened ...")) > 0:
1018 die("You have files opened with perforce! Close them before starting the sync.")
1019
Pete Wyckofff19cb0a2012-07-04 09:34:20 -04001020 def separate_jobs_from_description(self, message):
1021 """Extract and return a possible Jobs field in the commit
1022 message. It goes into a separate section in the p4 change
1023 specification.
1024
1025 A jobs line starts with "Jobs:" and looks like a new field
1026 in a form. Values are white-space separated on the same
1027 line or on following lines that start with a tab.
1028
1029 This does not parse and extract the full git commit message
1030 like a p4 form. It just sees the Jobs: line as a marker
1031 to pass everything from then on directly into the p4 form,
1032 but outside the description section.
1033
1034 Return a tuple (stripped log message, jobs string)."""
1035
1036 m = re.search(r'^Jobs:', message, re.MULTILINE)
1037 if m is None:
1038 return (message, None)
1039
1040 jobtext = message[m.start():]
1041 stripped_message = message[:m.start()].rstrip()
1042 return (stripped_message, jobtext)
1043
1044 def prepareLogMessage(self, template, message, jobs):
1045 """Edits the template returned from "p4 change -o" to insert
1046 the message in the Description field, and the jobs text in
1047 the Jobs field."""
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001048 result = ""
1049
Simon Hausmannedae1e22008-02-19 09:29:06 +01001050 inDescriptionSection = False
1051
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001052 for line in template.split("\n"):
1053 if line.startswith("#"):
1054 result += line + "\n"
1055 continue
1056
Simon Hausmannedae1e22008-02-19 09:29:06 +01001057 if inDescriptionSection:
Michael Horowitzc9dbab02011-02-25 21:31:13 -05001058 if line.startswith("Files:") or line.startswith("Jobs:"):
Simon Hausmannedae1e22008-02-19 09:29:06 +01001059 inDescriptionSection = False
Pete Wyckofff19cb0a2012-07-04 09:34:20 -04001060 # insert Jobs section
1061 if jobs:
1062 result += jobs + "\n"
Simon Hausmannedae1e22008-02-19 09:29:06 +01001063 else:
1064 continue
1065 else:
1066 if line.startswith("Description:"):
1067 inDescriptionSection = True
1068 line += "\n"
1069 for messageLine in message.split("\n"):
1070 line += "\t" + messageLine + "\n"
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001071
Simon Hausmannedae1e22008-02-19 09:29:06 +01001072 result += line + "\n"
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001073
1074 return result
1075
Luke Diamand60df0712012-02-23 07:51:30 +00001076 def patchRCSKeywords(self, file, pattern):
1077 # Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern
1078 (handle, outFileName) = tempfile.mkstemp(dir='.')
1079 try:
1080 outFile = os.fdopen(handle, "w+")
1081 inFile = open(file, "r")
1082 regexp = re.compile(pattern, re.VERBOSE)
1083 for line in inFile.readlines():
1084 line = regexp.sub(r'$\1$', line)
1085 outFile.write(line)
1086 inFile.close()
1087 outFile.close()
1088 # Forcibly overwrite the original file
1089 os.unlink(file)
1090 shutil.move(outFileName, file)
1091 except:
1092 # cleanup our temporary file
1093 os.unlink(outFileName)
1094 print "Failed to strip RCS keywords in %s" % file
1095 raise
1096
1097 print "Patched up RCS keywords in %s" % file
1098
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001099 def p4UserForCommit(self,id):
1100 # Return the tuple (perforce user,git email) for a given git commit id
1101 self.getUserMapFromPerforceServer()
Pete Wyckoff9bf28852013-01-26 22:11:20 -05001102 gitEmail = read_pipe(["git", "log", "--max-count=1",
1103 "--format=%ae", id])
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001104 gitEmail = gitEmail.strip()
1105 if not self.emails.has_key(gitEmail):
1106 return (None,gitEmail)
1107 else:
1108 return (self.emails[gitEmail],gitEmail)
1109
1110 def checkValidP4Users(self,commits):
1111 # check if any git authors cannot be mapped to p4 users
1112 for id in commits:
1113 (user,email) = self.p4UserForCommit(id)
1114 if not user:
1115 msg = "Cannot find p4 user for email %s in commit %s." % (email, id)
Pete Wyckoff0d609032013-01-26 22:11:24 -05001116 if gitConfigBool("git-p4.allowMissingP4Users"):
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001117 print "%s" % msg
1118 else:
1119 die("Error: %s\nSet git-p4.allowMissingP4Users to true to allow this." % msg)
1120
1121 def lastP4Changelist(self):
1122 # Get back the last changelist number submitted in this client spec. This
1123 # then gets used to patch up the username in the change. If the same
1124 # client spec is being used by multiple processes then this might go
1125 # wrong.
1126 results = p4CmdList("client -o") # find the current client
1127 client = None
1128 for r in results:
1129 if r.has_key('Client'):
1130 client = r['Client']
1131 break
1132 if not client:
1133 die("could not get client spec")
Luke Diamand6de040d2011-10-16 10:47:52 -04001134 results = p4CmdList(["changes", "-c", client, "-m", "1"])
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001135 for r in results:
1136 if r.has_key('change'):
1137 return r['change']
1138 die("Could not get changelist number for last submit - cannot patch up user details")
1139
1140 def modifyChangelistUser(self, changelist, newUser):
1141 # fixup the user field of a changelist after it has been submitted.
1142 changes = p4CmdList("change -o %s" % changelist)
Luke Diamandecdba362011-05-07 11:19:43 +01001143 if len(changes) != 1:
1144 die("Bad output from p4 change modifying %s to user %s" %
1145 (changelist, newUser))
1146
1147 c = changes[0]
1148 if c['User'] == newUser: return # nothing to do
1149 c['User'] = newUser
1150 input = marshal.dumps(c)
1151
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001152 result = p4CmdList("change -f -i", stdin=input)
1153 for r in result:
1154 if r.has_key('code'):
1155 if r['code'] == 'error':
1156 die("Could not modify user field of changelist %s to %s:%s" % (changelist, newUser, r['data']))
1157 if r.has_key('data'):
1158 print("Updated user field for changelist %s to %s" % (changelist, newUser))
1159 return
1160 die("Could not modify user field of changelist %s to %s" % (changelist, newUser))
1161
1162 def canChangeChangelists(self):
1163 # check to see if we have p4 admin or super-user permissions, either of
1164 # which are required to modify changelists.
Luke Diamand52a48802012-01-19 09:52:25 +00001165 results = p4CmdList(["protects", self.depotPath])
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001166 for r in results:
1167 if r.has_key('perm'):
1168 if r['perm'] == 'admin':
1169 return 1
1170 if r['perm'] == 'super':
1171 return 1
1172 return 0
1173
Simon Hausmannea99c3a2007-08-08 17:06:55 +02001174 def prepareSubmitTemplate(self):
Pete Wyckofff19cb0a2012-07-04 09:34:20 -04001175 """Run "p4 change -o" to grab a change specification template.
1176 This does not use "p4 -G", as it is nice to keep the submission
1177 template in original order, since a human might edit it.
1178
1179 Remove lines in the Files section that show changes to files
1180 outside the depot path we're committing into."""
1181
Simon Hausmannea99c3a2007-08-08 17:06:55 +02001182 template = ""
1183 inFilesSection = False
Luke Diamand6de040d2011-10-16 10:47:52 -04001184 for line in p4_read_pipe_lines(['change', '-o']):
Marius Storm-Olsenf3e5ae42008-03-28 15:40:40 +01001185 if line.endswith("\r\n"):
1186 line = line[:-2] + "\n"
Simon Hausmannea99c3a2007-08-08 17:06:55 +02001187 if inFilesSection:
1188 if line.startswith("\t"):
1189 # path starts and ends with a tab
1190 path = line[1:]
1191 lastTab = path.rfind("\t")
1192 if lastTab != -1:
1193 path = path[:lastTab]
Tor Arvid Lundd53de8b2011-03-15 13:08:02 +01001194 if not p4PathStartsWith(path, self.depotPath):
Simon Hausmannea99c3a2007-08-08 17:06:55 +02001195 continue
1196 else:
1197 inFilesSection = False
1198 else:
1199 if line.startswith("Files:"):
1200 inFilesSection = True
1201
1202 template += line
1203
1204 return template
1205
Pete Wyckoff7c766e52011-12-04 19:22:45 -05001206 def edit_template(self, template_file):
1207 """Invoke the editor to let the user change the submission
1208 message. Return true if okay to continue with the submit."""
1209
1210 # if configured to skip the editing part, just submit
Pete Wyckoff0d609032013-01-26 22:11:24 -05001211 if gitConfigBool("git-p4.skipSubmitEdit"):
Pete Wyckoff7c766e52011-12-04 19:22:45 -05001212 return True
1213
1214 # look at the modification time, to check later if the user saved
1215 # the file
1216 mtime = os.stat(template_file).st_mtime
1217
1218 # invoke the editor
Luke Diamandf95ceaf2012-04-24 09:33:21 +01001219 if os.environ.has_key("P4EDITOR") and (os.environ.get("P4EDITOR") != ""):
Pete Wyckoff7c766e52011-12-04 19:22:45 -05001220 editor = os.environ.get("P4EDITOR")
1221 else:
1222 editor = read_pipe("git var GIT_EDITOR").strip()
Pete Wyckoff0cf1b722014-01-21 18:16:44 -05001223 system([editor, template_file])
Pete Wyckoff7c766e52011-12-04 19:22:45 -05001224
1225 # If the file was not saved, prompt to see if this patch should
1226 # be skipped. But skip this verification step if configured so.
Pete Wyckoff0d609032013-01-26 22:11:24 -05001227 if gitConfigBool("git-p4.skipSubmitEditCheck"):
Pete Wyckoff7c766e52011-12-04 19:22:45 -05001228 return True
1229
Pete Wyckoffd1652042011-12-17 12:39:03 -05001230 # modification time updated means user saved the file
1231 if os.stat(template_file).st_mtime > mtime:
1232 return True
1233
1234 while True:
1235 response = raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")
1236 if response == 'y':
1237 return True
1238 if response == 'n':
1239 return False
Pete Wyckoff7c766e52011-12-04 19:22:45 -05001240
Han-Wen Nienhuys7cb5cbe2007-05-23 16:55:48 -03001241 def applyCommit(self, id):
Pete Wyckoff67b0fe22012-09-09 16:16:03 -04001242 """Apply one commit, return True if it succeeded."""
1243
1244 print "Applying", read_pipe(["git", "show", "-s",
1245 "--format=format:%h %s", id])
Vitor Antunesae901092011-02-20 01:18:24 +00001246
Luke Diamand848de9c2011-05-13 20:46:00 +01001247 (p4User, gitEmail) = self.p4UserForCommit(id)
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001248
Gary Gibbons84cb0002012-07-04 09:40:19 -04001249 diff = read_pipe_lines("git diff-tree -r %s \"%s^\" \"%s\"" % (self.diffOpts, id, id))
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001250 filesToAdd = set()
1251 filesToDelete = set()
Simon Hausmannd336c152007-05-16 09:41:26 +02001252 editedFiles = set()
Pete Wyckoffb6ad6dc2012-04-29 20:57:16 -04001253 pureRenameCopy = set()
Chris Pettittc65b6702007-11-01 20:43:14 -07001254 filesToChangeExecBit = {}
Luke Diamand60df0712012-02-23 07:51:30 +00001255
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001256 for line in diff:
Chris Pettittb43b0a32007-11-01 20:43:13 -07001257 diff = parseDiffTreeEntry(line)
1258 modifier = diff['status']
1259 path = diff['src']
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001260 if modifier == "M":
Luke Diamand6de040d2011-10-16 10:47:52 -04001261 p4_edit(path)
Chris Pettittc65b6702007-11-01 20:43:14 -07001262 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
1263 filesToChangeExecBit[path] = diff['dst_mode']
Simon Hausmannd336c152007-05-16 09:41:26 +02001264 editedFiles.add(path)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001265 elif modifier == "A":
1266 filesToAdd.add(path)
Chris Pettittc65b6702007-11-01 20:43:14 -07001267 filesToChangeExecBit[path] = diff['dst_mode']
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001268 if path in filesToDelete:
1269 filesToDelete.remove(path)
1270 elif modifier == "D":
1271 filesToDelete.add(path)
1272 if path in filesToAdd:
1273 filesToAdd.remove(path)
Vitor Antunes4fddb412011-02-20 01:18:25 +00001274 elif modifier == "C":
1275 src, dest = diff['src'], diff['dst']
Luke Diamand6de040d2011-10-16 10:47:52 -04001276 p4_integrate(src, dest)
Pete Wyckoffb6ad6dc2012-04-29 20:57:16 -04001277 pureRenameCopy.add(dest)
Vitor Antunes4fddb412011-02-20 01:18:25 +00001278 if diff['src_sha1'] != diff['dst_sha1']:
Luke Diamand6de040d2011-10-16 10:47:52 -04001279 p4_edit(dest)
Pete Wyckoffb6ad6dc2012-04-29 20:57:16 -04001280 pureRenameCopy.discard(dest)
Vitor Antunes4fddb412011-02-20 01:18:25 +00001281 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
Luke Diamand6de040d2011-10-16 10:47:52 -04001282 p4_edit(dest)
Pete Wyckoffb6ad6dc2012-04-29 20:57:16 -04001283 pureRenameCopy.discard(dest)
Vitor Antunes4fddb412011-02-20 01:18:25 +00001284 filesToChangeExecBit[dest] = diff['dst_mode']
Pete Wyckoffd20f0f82013-01-26 22:11:19 -05001285 if self.isWindows:
1286 # turn off read-only attribute
1287 os.chmod(dest, stat.S_IWRITE)
Vitor Antunes4fddb412011-02-20 01:18:25 +00001288 os.unlink(dest)
1289 editedFiles.add(dest)
Chris Pettittd9a5f252007-10-15 22:15:06 -07001290 elif modifier == "R":
Chris Pettittb43b0a32007-11-01 20:43:13 -07001291 src, dest = diff['src'], diff['dst']
Gary Gibbons8e9497c2012-07-12 19:29:00 -04001292 if self.p4HasMoveCommand:
1293 p4_edit(src) # src must be open before move
1294 p4_move(src, dest) # opens for (move/delete, move/add)
Pete Wyckoffb6ad6dc2012-04-29 20:57:16 -04001295 else:
Gary Gibbons8e9497c2012-07-12 19:29:00 -04001296 p4_integrate(src, dest)
1297 if diff['src_sha1'] != diff['dst_sha1']:
1298 p4_edit(dest)
1299 else:
1300 pureRenameCopy.add(dest)
Chris Pettittc65b6702007-11-01 20:43:14 -07001301 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
Gary Gibbons8e9497c2012-07-12 19:29:00 -04001302 if not self.p4HasMoveCommand:
1303 p4_edit(dest) # with move: already open, writable
Chris Pettittc65b6702007-11-01 20:43:14 -07001304 filesToChangeExecBit[dest] = diff['dst_mode']
Gary Gibbons8e9497c2012-07-12 19:29:00 -04001305 if not self.p4HasMoveCommand:
Pete Wyckoffd20f0f82013-01-26 22:11:19 -05001306 if self.isWindows:
1307 os.chmod(dest, stat.S_IWRITE)
Gary Gibbons8e9497c2012-07-12 19:29:00 -04001308 os.unlink(dest)
1309 filesToDelete.add(src)
Chris Pettittd9a5f252007-10-15 22:15:06 -07001310 editedFiles.add(dest)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001311 else:
1312 die("unknown modifier %s for %s" % (modifier, path))
1313
Tolga Ceylan749b6682014-05-06 22:48:54 -07001314 diffcmd = "git diff-tree --full-index -p \"%s\"" % (id)
Simon Hausmann47a130b2007-05-20 16:33:21 +02001315 patchcmd = diffcmd + " | git apply "
Simon Hausmannc1b296b2007-05-20 16:55:05 +02001316 tryPatchCmd = patchcmd + "--check -"
1317 applyPatchCmd = patchcmd + "--check --apply -"
Luke Diamand60df0712012-02-23 07:51:30 +00001318 patch_succeeded = True
Simon Hausmann51a26402007-04-15 09:59:56 +02001319
Simon Hausmann47a130b2007-05-20 16:33:21 +02001320 if os.system(tryPatchCmd) != 0:
Luke Diamand60df0712012-02-23 07:51:30 +00001321 fixed_rcs_keywords = False
1322 patch_succeeded = False
Simon Hausmann51a26402007-04-15 09:59:56 +02001323 print "Unfortunately applying the change failed!"
Luke Diamand60df0712012-02-23 07:51:30 +00001324
1325 # Patch failed, maybe it's just RCS keyword woes. Look through
1326 # the patch to see if that's possible.
Pete Wyckoff0d609032013-01-26 22:11:24 -05001327 if gitConfigBool("git-p4.attemptRCSCleanup"):
Luke Diamand60df0712012-02-23 07:51:30 +00001328 file = None
1329 pattern = None
1330 kwfiles = {}
1331 for file in editedFiles | filesToDelete:
1332 # did this file's delta contain RCS keywords?
1333 pattern = p4_keywords_regexp_for_file(file)
1334
1335 if pattern:
1336 # this file is a possibility...look for RCS keywords.
1337 regexp = re.compile(pattern, re.VERBOSE)
1338 for line in read_pipe_lines(["git", "diff", "%s^..%s" % (id, id), file]):
1339 if regexp.search(line):
1340 if verbose:
1341 print "got keyword match on %s in %s in %s" % (pattern, line, file)
1342 kwfiles[file] = pattern
1343 break
1344
1345 for file in kwfiles:
1346 if verbose:
1347 print "zapping %s with %s" % (line,pattern)
Pete Wyckoffd20f0f82013-01-26 22:11:19 -05001348 # File is being deleted, so not open in p4. Must
1349 # disable the read-only bit on windows.
1350 if self.isWindows and file not in editedFiles:
1351 os.chmod(file, stat.S_IWRITE)
Luke Diamand60df0712012-02-23 07:51:30 +00001352 self.patchRCSKeywords(file, kwfiles[file])
1353 fixed_rcs_keywords = True
1354
1355 if fixed_rcs_keywords:
1356 print "Retrying the patch with RCS keywords cleaned up"
1357 if os.system(tryPatchCmd) == 0:
1358 patch_succeeded = True
1359
1360 if not patch_succeeded:
Pete Wyckoff7e5dd9f2012-09-09 16:16:05 -04001361 for f in editedFiles:
1362 p4_revert(f)
Pete Wyckoff7e5dd9f2012-09-09 16:16:05 -04001363 return False
Simon Hausmann51a26402007-04-15 09:59:56 +02001364
Pete Wyckoff55ac2ed2012-09-09 16:16:08 -04001365 #
1366 # Apply the patch for real, and do add/delete/+x handling.
1367 #
Simon Hausmann47a130b2007-05-20 16:33:21 +02001368 system(applyPatchCmd)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001369
1370 for f in filesToAdd:
Luke Diamand6de040d2011-10-16 10:47:52 -04001371 p4_add(f)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001372 for f in filesToDelete:
Luke Diamand6de040d2011-10-16 10:47:52 -04001373 p4_revert(f)
1374 p4_delete(f)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001375
Chris Pettittc65b6702007-11-01 20:43:14 -07001376 # Set/clear executable bits
1377 for f in filesToChangeExecBit.keys():
1378 mode = filesToChangeExecBit[f]
1379 setP4ExecBit(f, mode)
1380
Pete Wyckoff55ac2ed2012-09-09 16:16:08 -04001381 #
1382 # Build p4 change description, starting with the contents
1383 # of the git commit message.
1384 #
Simon Hausmann0e36f2d2008-02-19 09:33:08 +01001385 logMessage = extractLogMessageFromGitCommit(id)
Simon Hausmann0e36f2d2008-02-19 09:33:08 +01001386 logMessage = logMessage.strip()
Pete Wyckofff19cb0a2012-07-04 09:34:20 -04001387 (logMessage, jobs) = self.separate_jobs_from_description(logMessage)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001388
Simon Hausmannea99c3a2007-08-08 17:06:55 +02001389 template = self.prepareSubmitTemplate()
Pete Wyckofff19cb0a2012-07-04 09:34:20 -04001390 submitTemplate = self.prepareLogMessage(template, logMessage, jobs)
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001391
1392 if self.preserveUser:
Pete Wyckoff55ac2ed2012-09-09 16:16:08 -04001393 submitTemplate += "\n######## Actual user %s, modified after commit\n" % p4User
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001394
Pete Wyckoff55ac2ed2012-09-09 16:16:08 -04001395 if self.checkAuthorship and not self.p4UserIsMe(p4User):
1396 submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail
1397 submitTemplate += "######## Use option --preserve-user to modify authorship.\n"
1398 submitTemplate += "######## Variable git-p4.skipUserNameCheck hides this message.\n"
1399
1400 separatorLine = "######## everything below this line is just the diff #######\n"
1401
1402 # diff
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001403 if os.environ.has_key("P4DIFF"):
1404 del(os.environ["P4DIFF"])
1405 diff = ""
1406 for editedFile in editedFiles:
1407 diff += p4_read_pipe(['diff', '-du',
1408 wildcard_encode(editedFile)])
1409
Pete Wyckoff55ac2ed2012-09-09 16:16:08 -04001410 # new file diff
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001411 newdiff = ""
1412 for newFile in filesToAdd:
1413 newdiff += "==== new file ====\n"
1414 newdiff += "--- /dev/null\n"
1415 newdiff += "+++ %s\n" % newFile
1416 f = open(newFile, "r")
1417 for line in f.readlines():
1418 newdiff += "+" + line
1419 f.close()
1420
Pete Wyckoff55ac2ed2012-09-09 16:16:08 -04001421 # change description file: submitTemplate, separatorLine, diff, newdiff
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001422 (handle, fileName) = tempfile.mkstemp()
1423 tmpFile = os.fdopen(handle, "w+")
1424 if self.isWindows:
1425 submitTemplate = submitTemplate.replace("\n", "\r\n")
1426 separatorLine = separatorLine.replace("\n", "\r\n")
1427 newdiff = newdiff.replace("\n", "\r\n")
1428 tmpFile.write(submitTemplate + separatorLine + diff + newdiff)
1429 tmpFile.close()
1430
Pete Wyckoff728b7ad2012-09-09 16:16:12 -04001431 if self.prepare_p4_only:
1432 #
1433 # Leave the p4 tree prepared, and the submit template around
1434 # and let the user decide what to do next
1435 #
1436 print
1437 print "P4 workspace prepared for submission."
1438 print "To submit or revert, go to client workspace"
1439 print " " + self.clientPath
1440 print
1441 print "To submit, use \"p4 submit\" to write a new description,"
1442 print "or \"p4 submit -i %s\" to use the one prepared by" \
1443 " \"git p4\"." % fileName
1444 print "You can delete the file \"%s\" when finished." % fileName
1445
1446 if self.preserveUser and p4User and not self.p4UserIsMe(p4User):
1447 print "To preserve change ownership by user %s, you must\n" \
1448 "do \"p4 change -f <change>\" after submitting and\n" \
1449 "edit the User field."
1450 if pureRenameCopy:
1451 print "After submitting, renamed files must be re-synced."
1452 print "Invoke \"p4 sync -f\" on each of these files:"
1453 for f in pureRenameCopy:
1454 print " " + f
1455
1456 print
1457 print "To revert the changes, use \"p4 revert ...\", and delete"
1458 print "the submit template file \"%s\"" % fileName
1459 if filesToAdd:
1460 print "Since the commit adds new files, they must be deleted:"
1461 for f in filesToAdd:
1462 print " " + f
1463 print
1464 return True
1465
Pete Wyckoff55ac2ed2012-09-09 16:16:08 -04001466 #
1467 # Let the user edit the change description, then submit it.
1468 #
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001469 if self.edit_template(fileName):
1470 # read the edited message and submit
Pete Wyckoff5a41c162012-09-09 16:16:06 -04001471 ret = True
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001472 tmpFile = open(fileName, "rb")
1473 message = tmpFile.read()
1474 tmpFile.close()
1475 submitTemplate = message[:message.index(separatorLine)]
1476 if self.isWindows:
1477 submitTemplate = submitTemplate.replace("\r\n", "\n")
1478 p4_write_pipe(['submit', '-i'], submitTemplate)
Luke Diamandecdba362011-05-07 11:19:43 +01001479
1480 if self.preserveUser:
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001481 if p4User:
1482 # Get last changelist number. Cannot easily get it from
1483 # the submit command output as the output is
1484 # unmarshalled.
1485 changelist = self.lastP4Changelist()
1486 self.modifyChangelistUser(changelist, p4User)
Luke Diamandecdba362011-05-07 11:19:43 +01001487
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001488 # The rename/copy happened by applying a patch that created a
1489 # new file. This leaves it writable, which confuses p4.
1490 for f in pureRenameCopy:
1491 p4_sync(f, "-f")
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001492
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001493 else:
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001494 # skip this patch
Pete Wyckoff5a41c162012-09-09 16:16:06 -04001495 ret = False
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001496 print "Submission cancelled, undoing p4 changes."
1497 for f in editedFiles:
1498 p4_revert(f)
1499 for f in filesToAdd:
1500 p4_revert(f)
1501 os.remove(f)
Pete Wyckoffdf9c5452012-09-09 16:16:09 -04001502 for f in filesToDelete:
1503 p4_revert(f)
Pete Wyckoffc47178d2012-07-04 09:34:18 -04001504
1505 os.remove(fileName)
Pete Wyckoff5a41c162012-09-09 16:16:06 -04001506 return ret
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001507
Luke Diamand06804c72012-04-11 17:21:24 +02001508 # Export git tags as p4 labels. Create a p4 label and then tag
1509 # with that.
1510 def exportGitTags(self, gitTags):
Luke Diamandc8942a22012-04-11 17:21:24 +02001511 validLabelRegexp = gitConfig("git-p4.labelExportRegexp")
1512 if len(validLabelRegexp) == 0:
1513 validLabelRegexp = defaultLabelRegexp
1514 m = re.compile(validLabelRegexp)
Luke Diamand06804c72012-04-11 17:21:24 +02001515
1516 for name in gitTags:
1517
1518 if not m.match(name):
1519 if verbose:
Luke Diamand05a3cec2012-05-11 07:25:17 +01001520 print "tag %s does not match regexp %s" % (name, validLabelRegexp)
Luke Diamand06804c72012-04-11 17:21:24 +02001521 continue
1522
1523 # Get the p4 commit this corresponds to
Luke Diamandc8942a22012-04-11 17:21:24 +02001524 logMessage = extractLogMessageFromGitCommit(name)
1525 values = extractSettingsGitLog(logMessage)
Luke Diamand06804c72012-04-11 17:21:24 +02001526
Luke Diamandc8942a22012-04-11 17:21:24 +02001527 if not values.has_key('change'):
Luke Diamand06804c72012-04-11 17:21:24 +02001528 # a tag pointing to something not sent to p4; ignore
1529 if verbose:
1530 print "git tag %s does not give a p4 commit" % name
1531 continue
Luke Diamandc8942a22012-04-11 17:21:24 +02001532 else:
1533 changelist = values['change']
Luke Diamand06804c72012-04-11 17:21:24 +02001534
1535 # Get the tag details.
1536 inHeader = True
1537 isAnnotated = False
1538 body = []
1539 for l in read_pipe_lines(["git", "cat-file", "-p", name]):
1540 l = l.strip()
1541 if inHeader:
1542 if re.match(r'tag\s+', l):
1543 isAnnotated = True
1544 elif re.match(r'\s*$', l):
1545 inHeader = False
1546 continue
1547 else:
1548 body.append(l)
1549
1550 if not isAnnotated:
1551 body = ["lightweight tag imported by git p4\n"]
1552
1553 # Create the label - use the same view as the client spec we are using
1554 clientSpec = getClientSpec()
1555
1556 labelTemplate = "Label: %s\n" % name
1557 labelTemplate += "Description:\n"
1558 for b in body:
1559 labelTemplate += "\t" + b + "\n"
1560 labelTemplate += "View:\n"
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09001561 for depot_side in clientSpec.mappings:
1562 labelTemplate += "\t%s\n" % depot_side
Luke Diamand06804c72012-04-11 17:21:24 +02001563
Pete Wyckoffef739f02012-09-09 16:16:11 -04001564 if self.dry_run:
1565 print "Would create p4 label %s for tag" % name
Pete Wyckoff728b7ad2012-09-09 16:16:12 -04001566 elif self.prepare_p4_only:
1567 print "Not creating p4 label %s for tag due to option" \
1568 " --prepare-p4-only" % name
Pete Wyckoffef739f02012-09-09 16:16:11 -04001569 else:
1570 p4_write_pipe(["label", "-i"], labelTemplate)
Luke Diamand06804c72012-04-11 17:21:24 +02001571
Pete Wyckoffef739f02012-09-09 16:16:11 -04001572 # Use the label
1573 p4_system(["tag", "-l", name] +
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09001574 ["%s@%s" % (depot_side, changelist) for depot_side in clientSpec.mappings])
Luke Diamand06804c72012-04-11 17:21:24 +02001575
Pete Wyckoffef739f02012-09-09 16:16:11 -04001576 if verbose:
1577 print "created p4 label for tag %s" % name
Luke Diamand06804c72012-04-11 17:21:24 +02001578
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001579 def run(self, args):
Simon Hausmannc9b50e62007-03-29 19:15:24 +02001580 if len(args) == 0:
1581 self.master = currentGitBranch()
Simon Hausmann4280e532007-05-25 08:49:18 +02001582 if len(self.master) == 0 or not gitBranchExists("refs/heads/%s" % self.master):
Simon Hausmannc9b50e62007-03-29 19:15:24 +02001583 die("Detecting current git branch failed!")
1584 elif len(args) == 1:
1585 self.master = args[0]
Pete Wyckoff28755db2011-12-24 21:07:40 -05001586 if not branchExists(self.master):
1587 die("Branch %s does not exist" % self.master)
Simon Hausmannc9b50e62007-03-29 19:15:24 +02001588 else:
1589 return False
1590
Jing Xue4c2d5d72008-06-22 14:12:39 -04001591 allowSubmit = gitConfig("git-p4.allowSubmit")
1592 if len(allowSubmit) > 0 and not self.master in allowSubmit.split(","):
1593 die("%s is not in git-p4.allowSubmit" % self.master)
1594
Simon Hausmann27d2d812007-06-12 14:31:59 +02001595 [upstream, settings] = findUpstreamBranchPoint()
Simon Hausmannea99c3a2007-08-08 17:06:55 +02001596 self.depotPath = settings['depot-paths'][0]
Simon Hausmann27d2d812007-06-12 14:31:59 +02001597 if len(self.origin) == 0:
1598 self.origin = upstream
Simon Hausmanna3fdd572007-06-07 22:54:32 +02001599
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001600 if self.preserveUser:
1601 if not self.canChangeChangelists():
1602 die("Cannot preserve user names without p4 super-user or admin permissions")
1603
Pete Wyckoff6bbfd132012-09-09 16:16:13 -04001604 # if not set from the command line, try the config file
1605 if self.conflict_behavior is None:
1606 val = gitConfig("git-p4.conflict")
1607 if val:
1608 if val not in self.conflict_behavior_choices:
1609 die("Invalid value '%s' for config git-p4.conflict" % val)
1610 else:
1611 val = "ask"
1612 self.conflict_behavior = val
1613
Simon Hausmanna3fdd572007-06-07 22:54:32 +02001614 if self.verbose:
1615 print "Origin branch is " + self.origin
Simon Hausmann95124972007-03-23 09:16:07 +01001616
Simon Hausmannea99c3a2007-08-08 17:06:55 +02001617 if len(self.depotPath) == 0:
Simon Hausmann95124972007-03-23 09:16:07 +01001618 print "Internal error: cannot locate perforce depot path from existing branches"
1619 sys.exit(128)
1620
Pete Wyckoff543987b2012-02-25 20:06:25 -05001621 self.useClientSpec = False
Pete Wyckoff0d609032013-01-26 22:11:24 -05001622 if gitConfigBool("git-p4.useclientspec"):
Pete Wyckoff543987b2012-02-25 20:06:25 -05001623 self.useClientSpec = True
1624 if self.useClientSpec:
1625 self.clientSpecDirs = getClientSpec()
Simon Hausmann95124972007-03-23 09:16:07 +01001626
Pete Wyckoff543987b2012-02-25 20:06:25 -05001627 if self.useClientSpec:
1628 # all files are relative to the client spec
1629 self.clientPath = getClientRoot()
1630 else:
1631 self.clientPath = p4Where(self.depotPath)
1632
1633 if self.clientPath == "":
1634 die("Error: Cannot locate perforce checkout of %s in client view" % self.depotPath)
Simon Hausmann95124972007-03-23 09:16:07 +01001635
Simon Hausmannea99c3a2007-08-08 17:06:55 +02001636 print "Perforce checkout for depot path %s located at %s" % (self.depotPath, self.clientPath)
Simon Hausmann7944f142007-05-21 11:04:26 +02001637 self.oldWorkingDirectory = os.getcwd()
Simon Hausmannc1b296b2007-05-20 16:55:05 +02001638
Gary Gibbons0591cfa2011-12-09 18:48:14 -05001639 # ensure the clientPath exists
Pete Wyckoff8d7ec362012-04-29 20:57:14 -04001640 new_client_dir = False
Gary Gibbons0591cfa2011-12-09 18:48:14 -05001641 if not os.path.exists(self.clientPath):
Pete Wyckoff8d7ec362012-04-29 20:57:14 -04001642 new_client_dir = True
Gary Gibbons0591cfa2011-12-09 18:48:14 -05001643 os.makedirs(self.clientPath)
1644
Miklós Fazekasbbd84862013-03-11 17:45:29 -04001645 chdir(self.clientPath, is_client_path=True)
Pete Wyckoffef739f02012-09-09 16:16:11 -04001646 if self.dry_run:
1647 print "Would synchronize p4 checkout in %s" % self.clientPath
Pete Wyckoff8d7ec362012-04-29 20:57:14 -04001648 else:
Pete Wyckoffef739f02012-09-09 16:16:11 -04001649 print "Synchronizing p4 checkout..."
1650 if new_client_dir:
1651 # old one was destroyed, and maybe nobody told p4
1652 p4_sync("...", "-f")
1653 else:
1654 p4_sync("...")
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001655 self.check()
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001656
Simon Hausmann4c750c02008-02-19 09:37:16 +01001657 commits = []
Pete Wyckoffc7d34882013-01-26 22:11:21 -05001658 for line in read_pipe_lines(["git", "rev-list", "--no-merges", "%s..%s" % (self.origin, self.master)]):
Simon Hausmann4c750c02008-02-19 09:37:16 +01001659 commits.append(line.strip())
1660 commits.reverse()
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001661
Pete Wyckoff0d609032013-01-26 22:11:24 -05001662 if self.preserveUser or gitConfigBool("git-p4.skipUserNameCheck"):
Luke Diamand848de9c2011-05-13 20:46:00 +01001663 self.checkAuthorship = False
1664 else:
1665 self.checkAuthorship = True
1666
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001667 if self.preserveUser:
1668 self.checkValidP4Users(commits)
1669
Gary Gibbons84cb0002012-07-04 09:40:19 -04001670 #
1671 # Build up a set of options to be passed to diff when
1672 # submitting each commit to p4.
1673 #
1674 if self.detectRenames:
1675 # command-line -M arg
1676 self.diffOpts = "-M"
1677 else:
1678 # If not explicitly set check the config variable
1679 detectRenames = gitConfig("git-p4.detectRenames")
1680
1681 if detectRenames.lower() == "false" or detectRenames == "":
1682 self.diffOpts = ""
1683 elif detectRenames.lower() == "true":
1684 self.diffOpts = "-M"
1685 else:
1686 self.diffOpts = "-M%s" % detectRenames
1687
1688 # no command-line arg for -C or --find-copies-harder, just
1689 # config variables
1690 detectCopies = gitConfig("git-p4.detectCopies")
1691 if detectCopies.lower() == "false" or detectCopies == "":
1692 pass
1693 elif detectCopies.lower() == "true":
1694 self.diffOpts += " -C"
1695 else:
1696 self.diffOpts += " -C%s" % detectCopies
1697
Pete Wyckoff0d609032013-01-26 22:11:24 -05001698 if gitConfigBool("git-p4.detectCopiesHarder"):
Gary Gibbons84cb0002012-07-04 09:40:19 -04001699 self.diffOpts += " --find-copies-harder"
1700
Pete Wyckoff7e5dd9f2012-09-09 16:16:05 -04001701 #
1702 # Apply the commits, one at a time. On failure, ask if should
1703 # continue to try the rest of the patches, or quit.
1704 #
Pete Wyckoffef739f02012-09-09 16:16:11 -04001705 if self.dry_run:
1706 print "Would apply"
Pete Wyckoff67b0fe22012-09-09 16:16:03 -04001707 applied = []
Pete Wyckoff7e5dd9f2012-09-09 16:16:05 -04001708 last = len(commits) - 1
1709 for i, commit in enumerate(commits):
Pete Wyckoffef739f02012-09-09 16:16:11 -04001710 if self.dry_run:
1711 print " ", read_pipe(["git", "show", "-s",
1712 "--format=format:%h %s", commit])
1713 ok = True
1714 else:
1715 ok = self.applyCommit(commit)
Pete Wyckoff67b0fe22012-09-09 16:16:03 -04001716 if ok:
1717 applied.append(commit)
Pete Wyckoff7e5dd9f2012-09-09 16:16:05 -04001718 else:
Pete Wyckoff728b7ad2012-09-09 16:16:12 -04001719 if self.prepare_p4_only and i < last:
1720 print "Processing only the first commit due to option" \
1721 " --prepare-p4-only"
1722 break
Pete Wyckoff7e5dd9f2012-09-09 16:16:05 -04001723 if i < last:
1724 quit = False
1725 while True:
Pete Wyckoff6bbfd132012-09-09 16:16:13 -04001726 # prompt for what to do, or use the option/variable
1727 if self.conflict_behavior == "ask":
1728 print "What do you want to do?"
1729 response = raw_input("[s]kip this commit but apply"
1730 " the rest, or [q]uit? ")
1731 if not response:
1732 continue
1733 elif self.conflict_behavior == "skip":
1734 response = "s"
1735 elif self.conflict_behavior == "quit":
1736 response = "q"
1737 else:
1738 die("Unknown conflict_behavior '%s'" %
1739 self.conflict_behavior)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001740
Pete Wyckoff7e5dd9f2012-09-09 16:16:05 -04001741 if response[0] == "s":
1742 print "Skipping this commit, but applying the rest"
1743 break
1744 if response[0] == "q":
1745 print "Quitting"
1746 quit = True
1747 break
1748 if quit:
1749 break
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001750
Pete Wyckoff67b0fe22012-09-09 16:16:03 -04001751 chdir(self.oldWorkingDirectory)
1752
Pete Wyckoffef739f02012-09-09 16:16:11 -04001753 if self.dry_run:
1754 pass
Pete Wyckoff728b7ad2012-09-09 16:16:12 -04001755 elif self.prepare_p4_only:
1756 pass
Pete Wyckoffef739f02012-09-09 16:16:11 -04001757 elif len(commits) == len(applied):
Pete Wyckoff67b0fe22012-09-09 16:16:03 -04001758 print "All commits applied!"
Simon Hausmann14594f42007-08-22 09:07:15 +02001759
Simon Hausmann4c750c02008-02-19 09:37:16 +01001760 sync = P4Sync()
Pete Wyckoff44e8d262013-01-14 19:47:08 -05001761 if self.branch:
1762 sync.branch = self.branch
Simon Hausmann4c750c02008-02-19 09:37:16 +01001763 sync.run([])
Simon Hausmann14594f42007-08-22 09:07:15 +02001764
Simon Hausmann4c750c02008-02-19 09:37:16 +01001765 rebase = P4Rebase()
1766 rebase.rebase()
Simon Hausmann4f5cf762007-03-19 22:25:17 +01001767
Pete Wyckoff67b0fe22012-09-09 16:16:03 -04001768 else:
1769 if len(applied) == 0:
1770 print "No commits applied."
1771 else:
1772 print "Applied only the commits marked with '*':"
1773 for c in commits:
1774 if c in applied:
1775 star = "*"
1776 else:
1777 star = " "
1778 print star, read_pipe(["git", "show", "-s",
1779 "--format=format:%h %s", c])
1780 print "You will have to do 'git p4 sync' and rebase."
1781
Pete Wyckoff0d609032013-01-26 22:11:24 -05001782 if gitConfigBool("git-p4.exportLabels"):
Luke Diamand06dcd152012-05-11 07:25:18 +01001783 self.exportLabels = True
Luke Diamand06804c72012-04-11 17:21:24 +02001784
1785 if self.exportLabels:
1786 p4Labels = getP4Labels(self.depotPath)
1787 gitTags = getGitTags()
1788
1789 missingGitTags = gitTags - p4Labels
1790 self.exportGitTags(missingGitTags)
1791
Ondřej Bílka98e023d2013-07-29 10:18:21 +02001792 # exit with error unless everything applied perfectly
Pete Wyckoff67b0fe22012-09-09 16:16:03 -04001793 if len(commits) != len(applied):
1794 sys.exit(1)
1795
Simon Hausmannb9847332007-03-20 20:54:23 +01001796 return True
1797
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05001798class View(object):
1799 """Represent a p4 view ("p4 help views"), and map files in a
1800 repo according to the view."""
1801
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09001802 def __init__(self, client_name):
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05001803 self.mappings = []
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09001804 self.client_prefix = "//%s/" % client_name
1805 # cache results of "p4 where" to lookup client file locations
1806 self.client_spec_path_cache = {}
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05001807
1808 def append(self, view_line):
1809 """Parse a view line, splitting it into depot and client
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09001810 sides. Append to self.mappings, preserving order. This
1811 is only needed for tag creation."""
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05001812
1813 # Split the view line into exactly two words. P4 enforces
1814 # structure on these lines that simplifies this quite a bit.
1815 #
1816 # Either or both words may be double-quoted.
1817 # Single quotes do not matter.
1818 # Double-quote marks cannot occur inside the words.
1819 # A + or - prefix is also inside the quotes.
1820 # There are no quotes unless they contain a space.
1821 # The line is already white-space stripped.
1822 # The two words are separated by a single space.
1823 #
1824 if view_line[0] == '"':
1825 # First word is double quoted. Find its end.
1826 close_quote_index = view_line.find('"', 1)
1827 if close_quote_index <= 0:
1828 die("No first-word closing quote found: %s" % view_line)
1829 depot_side = view_line[1:close_quote_index]
1830 # skip closing quote and space
1831 rhs_index = close_quote_index + 1 + 1
1832 else:
1833 space_index = view_line.find(" ")
1834 if space_index <= 0:
1835 die("No word-splitting space found: %s" % view_line)
1836 depot_side = view_line[0:space_index]
1837 rhs_index = space_index + 1
1838
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05001839 # prefix + means overlay on previous mapping
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05001840 if depot_side.startswith("+"):
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05001841 depot_side = depot_side[1:]
1842
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09001843 # prefix - means exclude this path, leave out of mappings
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05001844 exclude = False
1845 if depot_side.startswith("-"):
1846 exclude = True
1847 depot_side = depot_side[1:]
1848
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09001849 if not exclude:
1850 self.mappings.append(depot_side)
1851
1852 def convert_client_path(self, clientFile):
1853 # chop off //client/ part to make it relative
1854 if not clientFile.startswith(self.client_prefix):
1855 die("No prefix '%s' on clientFile '%s'" %
1856 (self.client_prefix, clientFile))
1857 return clientFile[len(self.client_prefix):]
1858
1859 def update_client_spec_path_cache(self, files):
1860 """ Caching file paths by "p4 where" batch query """
1861
1862 # List depot file paths exclude that already cached
1863 fileArgs = [f['path'] for f in files if f['path'] not in self.client_spec_path_cache]
1864
1865 if len(fileArgs) == 0:
1866 return # All files in cache
1867
1868 where_result = p4CmdList(["-x", "-", "where"], stdin=fileArgs)
1869 for res in where_result:
1870 if "code" in res and res["code"] == "error":
1871 # assume error is "... file(s) not in client view"
1872 continue
1873 if "clientFile" not in res:
Pete Wyckoff20005442014-01-21 18:16:46 -05001874 die("No clientFile in 'p4 where' output")
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09001875 if "unmap" in res:
1876 # it will list all of them, but only one not unmap-ped
1877 continue
1878 self.client_spec_path_cache[res['depotFile']] = self.convert_client_path(res["clientFile"])
1879
1880 # not found files or unmap files set to ""
1881 for depotFile in fileArgs:
1882 if depotFile not in self.client_spec_path_cache:
1883 self.client_spec_path_cache[depotFile] = ""
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05001884
1885 def map_in_client(self, depot_path):
1886 """Return the relative location in the client where this
1887 depot file should live. Returns "" if the file should
1888 not be mapped in the client."""
1889
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09001890 if depot_path in self.client_spec_path_cache:
1891 return self.client_spec_path_cache[depot_path]
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05001892
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09001893 die( "Error: %s is not found in client spec path" % depot_path )
1894 return ""
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05001895
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001896class P4Sync(Command, P4UserMap):
Pete Wyckoff56c09342011-02-19 08:17:57 -05001897 delete_actions = ( "delete", "move/delete", "purge" )
1898
Simon Hausmannb9847332007-03-20 20:54:23 +01001899 def __init__(self):
1900 Command.__init__(self)
Luke Diamand3ea2cfd2011-04-21 20:50:23 +01001901 P4UserMap.__init__(self)
Simon Hausmannb9847332007-03-20 20:54:23 +01001902 self.options = [
1903 optparse.make_option("--branch", dest="branch"),
1904 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),
1905 optparse.make_option("--changesfile", dest="changesFile"),
1906 optparse.make_option("--silent", dest="silent", action="store_true"),
Simon Hausmannef48f902007-05-17 22:17:49 +02001907 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),
Luke Diamand06804c72012-04-11 17:21:24 +02001908 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),
Han-Wen Nienhuysd2c6dd32007-05-23 18:49:35 -03001909 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",
1910 help="Import into refs/heads/ , not refs/remotes"),
Han-Wen Nienhuys8b41a972007-05-23 18:20:53 -03001911 optparse.make_option("--max-changes", dest="maxChanges"),
Han-Wen Nienhuys86dff6b2007-05-23 18:49:35 -03001912 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',
Tor Arvid Lund3a70cdf2008-02-18 15:22:08 +01001913 help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),
1914 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',
1915 help="Only sync files that are included in the Perforce Client Spec")
Simon Hausmannb9847332007-03-20 20:54:23 +01001916 ]
1917 self.description = """Imports from Perforce into a git repository.\n
1918 example:
1919 //depot/my/project/ -- to import the current head
1920 //depot/my/project/@all -- to import everything
1921 //depot/my/project/@1,6 -- to import only from revision 1 to 6
1922
1923 (a ... is not needed in the path p4 specification, it's added implicitly)"""
1924
1925 self.usage += " //depot/path[@revRange]"
Simon Hausmannb9847332007-03-20 20:54:23 +01001926 self.silent = False
Reilly Grant1d7367d2009-09-10 00:02:38 -07001927 self.createdBranches = set()
1928 self.committedChanges = set()
Simon Hausmann569d1bd2007-03-22 21:34:16 +01001929 self.branch = ""
Simon Hausmannb9847332007-03-20 20:54:23 +01001930 self.detectBranches = False
Simon Hausmanncb53e1f2007-04-08 00:12:02 +02001931 self.detectLabels = False
Luke Diamand06804c72012-04-11 17:21:24 +02001932 self.importLabels = False
Simon Hausmannb9847332007-03-20 20:54:23 +01001933 self.changesFile = ""
Simon Hausmann01265102007-05-25 10:36:10 +02001934 self.syncWithOrigin = True
Simon Hausmanna028a982007-05-23 00:03:08 +02001935 self.importIntoRemotes = True
Simon Hausmann01a9c9c2007-05-23 00:07:35 +02001936 self.maxChanges = ""
Han-Wen Nienhuys8b41a972007-05-23 18:20:53 -03001937 self.keepRepoPath = False
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03001938 self.depotPaths = None
Simon Hausmann3c699642007-06-16 13:09:21 +02001939 self.p4BranchesInGit = []
Tommy Thorn354081d2008-02-03 10:38:51 -08001940 self.cloneExclude = []
Tor Arvid Lund3a70cdf2008-02-18 15:22:08 +01001941 self.useClientSpec = False
Pete Wyckoffa93d33e2012-02-25 20:06:24 -05001942 self.useClientSpec_from_options = False
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05001943 self.clientSpecDirs = None
Vitor Antunesfed23692012-01-25 23:48:22 +00001944 self.tempBranches = []
1945 self.tempBranchLocation = "git-p4-tmp"
Simon Hausmannb9847332007-03-20 20:54:23 +01001946
Simon Hausmann01265102007-05-25 10:36:10 +02001947 if gitConfig("git-p4.syncFromOrigin") == "false":
1948 self.syncWithOrigin = False
1949
Vitor Antunesfed23692012-01-25 23:48:22 +00001950 # Force a checkpoint in fast-import and wait for it to finish
1951 def checkpoint(self):
1952 self.gitStream.write("checkpoint\n\n")
1953 self.gitStream.write("progress checkpoint\n\n")
1954 out = self.gitOutput.readline()
1955 if self.verbose:
1956 print "checkpoint finished: " + out
1957
Simon Hausmannb9847332007-03-20 20:54:23 +01001958 def extractFilesFromCommit(self, commit):
Tommy Thorn354081d2008-02-03 10:38:51 -08001959 self.cloneExclude = [re.sub(r"\.\.\.$", "", path)
1960 for path in self.cloneExclude]
Simon Hausmannb9847332007-03-20 20:54:23 +01001961 files = []
1962 fnum = 0
1963 while commit.has_key("depotFile%s" % fnum):
1964 path = commit["depotFile%s" % fnum]
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03001965
Tommy Thorn354081d2008-02-03 10:38:51 -08001966 if [p for p in self.cloneExclude
Tor Arvid Lundd53de8b2011-03-15 13:08:02 +01001967 if p4PathStartsWith(path, p)]:
Tommy Thorn354081d2008-02-03 10:38:51 -08001968 found = False
1969 else:
1970 found = [p for p in self.depotPaths
Tor Arvid Lundd53de8b2011-03-15 13:08:02 +01001971 if p4PathStartsWith(path, p)]
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03001972 if not found:
Simon Hausmannb9847332007-03-20 20:54:23 +01001973 fnum = fnum + 1
1974 continue
1975
1976 file = {}
1977 file["path"] = path
1978 file["rev"] = commit["rev%s" % fnum]
1979 file["action"] = commit["action%s" % fnum]
1980 file["type"] = commit["type%s" % fnum]
1981 files.append(file)
1982 fnum = fnum + 1
1983 return files
1984
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03001985 def stripRepoPath(self, path, prefixes):
Pete Wyckoff21ef5df2012-08-11 12:55:04 -04001986 """When streaming files, this is called to map a p4 depot path
1987 to where it should go in git. The prefixes are either
1988 self.depotPaths, or self.branchPrefixes in the case of
1989 branch detection."""
1990
Ian Wienand39527102011-02-11 16:33:48 -08001991 if self.useClientSpec:
Pete Wyckoff21ef5df2012-08-11 12:55:04 -04001992 # branch detection moves files up a level (the branch name)
1993 # from what client spec interpretation gives
Pete Wyckoff0d1696e2012-08-11 12:55:03 -04001994 path = self.clientSpecDirs.map_in_client(path)
Pete Wyckoff21ef5df2012-08-11 12:55:04 -04001995 if self.detectBranches:
1996 for b in self.knownBranches:
1997 if path.startswith(b + "/"):
1998 path = path[len(b)+1:]
1999
2000 elif self.keepRepoPath:
2001 # Preserve everything in relative path name except leading
2002 # //depot/; just look at first prefix as they all should
2003 # be in the same depot.
2004 depot = re.sub("^(//[^/]+/).*", r'\1', prefixes[0])
2005 if p4PathStartsWith(path, depot):
2006 path = path[len(depot):]
Ian Wienand39527102011-02-11 16:33:48 -08002007
Pete Wyckoff0d1696e2012-08-11 12:55:03 -04002008 else:
Pete Wyckoff0d1696e2012-08-11 12:55:03 -04002009 for p in prefixes:
2010 if p4PathStartsWith(path, p):
2011 path = path[len(p):]
Pete Wyckoff21ef5df2012-08-11 12:55:04 -04002012 break
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002013
Pete Wyckoff0d1696e2012-08-11 12:55:03 -04002014 path = wildcard_decode(path)
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002015 return path
Han-Wen Nienhuys6754a292007-05-23 17:41:50 -03002016
Simon Hausmann71b112d2007-05-19 11:54:11 +02002017 def splitFilesIntoBranches(self, commit):
Pete Wyckoff21ef5df2012-08-11 12:55:04 -04002018 """Look at each depotFile in the commit to figure out to what
2019 branch it belongs."""
2020
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09002021 if self.clientSpecDirs:
2022 files = self.extractFilesFromCommit(commit)
2023 self.clientSpecDirs.update_client_spec_path_cache(files)
2024
Simon Hausmannd5904672007-05-19 11:07:32 +02002025 branches = {}
Simon Hausmann71b112d2007-05-19 11:54:11 +02002026 fnum = 0
2027 while commit.has_key("depotFile%s" % fnum):
2028 path = commit["depotFile%s" % fnum]
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002029 found = [p for p in self.depotPaths
Tor Arvid Lundd53de8b2011-03-15 13:08:02 +01002030 if p4PathStartsWith(path, p)]
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002031 if not found:
Simon Hausmann71b112d2007-05-19 11:54:11 +02002032 fnum = fnum + 1
2033 continue
2034
2035 file = {}
2036 file["path"] = path
2037 file["rev"] = commit["rev%s" % fnum]
2038 file["action"] = commit["action%s" % fnum]
2039 file["type"] = commit["type%s" % fnum]
2040 fnum = fnum + 1
2041
Pete Wyckoff21ef5df2012-08-11 12:55:04 -04002042 # start with the full relative path where this file would
2043 # go in a p4 client
2044 if self.useClientSpec:
2045 relPath = self.clientSpecDirs.map_in_client(path)
2046 else:
2047 relPath = self.stripRepoPath(path, self.depotPaths)
Simon Hausmannb9847332007-03-20 20:54:23 +01002048
Simon Hausmann4b97ffb2007-05-18 21:45:23 +02002049 for branch in self.knownBranches.keys():
Pete Wyckoff21ef5df2012-08-11 12:55:04 -04002050 # add a trailing slash so that a commit into qt/4.2foo
2051 # doesn't end up in qt/4.2, e.g.
Han-Wen Nienhuys6754a292007-05-23 17:41:50 -03002052 if relPath.startswith(branch + "/"):
Simon Hausmannd5904672007-05-19 11:07:32 +02002053 if branch not in branches:
2054 branches[branch] = []
Simon Hausmann71b112d2007-05-19 11:54:11 +02002055 branches[branch].append(file)
Simon Hausmann6555b2c2007-06-17 11:25:34 +02002056 break
Simon Hausmannb9847332007-03-20 20:54:23 +01002057
2058 return branches
2059
Luke Diamandb9327052009-07-30 00:13:46 +01002060 # output one file from the P4 stream
2061 # - helper for streamP4Files
2062
2063 def streamOneP4File(self, file, contents):
Luke Diamandb9327052009-07-30 00:13:46 +01002064 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)
2065 if verbose:
2066 sys.stderr.write("%s\n" % relPath)
2067
Pete Wyckoff9cffb8c2011-10-16 10:45:01 -04002068 (type_base, type_mods) = split_p4_type(file["type"])
2069
2070 git_mode = "100644"
2071 if "x" in type_mods:
2072 git_mode = "100755"
2073 if type_base == "symlink":
2074 git_mode = "120000"
Alexandru Juncu1292df12013-08-08 16:17:38 +03002075 # p4 print on a symlink sometimes contains "target\n";
2076 # if it does, remove the newline
Evan Powersb39c3612010-02-16 00:44:08 -08002077 data = ''.join(contents)
Pete Wyckoff40f846c2014-01-21 18:16:40 -05002078 if not data:
2079 # Some version of p4 allowed creating a symlink that pointed
2080 # to nothing. This causes p4 errors when checking out such
2081 # a change, and errors here too. Work around it by ignoring
2082 # the bad symlink; hopefully a future change fixes it.
2083 print "\nIgnoring empty symlink in %s" % file['depotFile']
2084 return
2085 elif data[-1] == '\n':
Alexandru Juncu1292df12013-08-08 16:17:38 +03002086 contents = [data[:-1]]
2087 else:
2088 contents = [data]
Luke Diamandb9327052009-07-30 00:13:46 +01002089
Pete Wyckoff9cffb8c2011-10-16 10:45:01 -04002090 if type_base == "utf16":
Pete Wyckoff55aa5712011-09-17 19:16:14 -04002091 # p4 delivers different text in the python output to -G
2092 # than it does when using "print -o", or normal p4 client
2093 # operations. utf16 is converted to ascii or utf8, perhaps.
2094 # But ascii text saved as -t utf16 is completely mangled.
2095 # Invoke print -o to get the real contents.
Pete Wyckoff7f0e5962013-01-26 22:11:13 -05002096 #
2097 # On windows, the newlines will always be mangled by print, so put
2098 # them back too. This is not needed to the cygwin windows version,
2099 # just the native "NT" type.
2100 #
Luke Diamand6de040d2011-10-16 10:47:52 -04002101 text = p4_read_pipe(['print', '-q', '-o', '-', file['depotFile']])
Pete Wyckoff7f0e5962013-01-26 22:11:13 -05002102 if p4_version_string().find("/NT") >= 0:
2103 text = text.replace("\r\n", "\n")
Pete Wyckoff55aa5712011-09-17 19:16:14 -04002104 contents = [ text ]
2105
Pete Wyckoff9f7ef0e2011-11-05 13:36:07 -04002106 if type_base == "apple":
2107 # Apple filetype files will be streamed as a concatenation of
2108 # its appledouble header and the contents. This is useless
2109 # on both macs and non-macs. If using "print -q -o xx", it
2110 # will create "xx" with the data, and "%xx" with the header.
2111 # This is also not very useful.
2112 #
2113 # Ideally, someday, this script can learn how to generate
2114 # appledouble files directly and import those to git, but
2115 # non-mac machines can never find a use for apple filetype.
2116 print "\nIgnoring apple filetype file %s" % file['depotFile']
2117 return
2118
Pete Wyckoff55aa5712011-09-17 19:16:14 -04002119 # Note that we do not try to de-mangle keywords on utf16 files,
2120 # even though in theory somebody may want that.
Luke Diamand60df0712012-02-23 07:51:30 +00002121 pattern = p4_keywords_regexp_for_type(type_base, type_mods)
2122 if pattern:
2123 regexp = re.compile(pattern, re.VERBOSE)
2124 text = ''.join(contents)
2125 text = regexp.sub(r'$\1$', text)
2126 contents = [ text ]
Luke Diamandb9327052009-07-30 00:13:46 +01002127
Pete Wyckoff9cffb8c2011-10-16 10:45:01 -04002128 self.gitStream.write("M %s inline %s\n" % (git_mode, relPath))
Luke Diamandb9327052009-07-30 00:13:46 +01002129
2130 # total length...
2131 length = 0
2132 for d in contents:
2133 length = length + len(d)
2134
2135 self.gitStream.write("data %d\n" % length)
2136 for d in contents:
2137 self.gitStream.write(d)
2138 self.gitStream.write("\n")
2139
2140 def streamOneP4Deletion(self, file):
2141 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)
2142 if verbose:
2143 sys.stderr.write("delete %s\n" % relPath)
2144 self.gitStream.write("D %s\n" % relPath)
2145
2146 # handle another chunk of streaming data
2147 def streamP4FilesCb(self, marshalled):
2148
Pete Wyckoff78189be2012-11-23 17:35:36 -05002149 # catch p4 errors and complain
2150 err = None
2151 if "code" in marshalled:
2152 if marshalled["code"] == "error":
2153 if "data" in marshalled:
2154 err = marshalled["data"].rstrip()
2155 if err:
2156 f = None
2157 if self.stream_have_file_info:
2158 if "depotFile" in self.stream_file:
2159 f = self.stream_file["depotFile"]
2160 # force a failure in fast-import, else an empty
2161 # commit will be made
2162 self.gitStream.write("\n")
2163 self.gitStream.write("die-now\n")
2164 self.gitStream.close()
2165 # ignore errors, but make sure it exits first
2166 self.importProcess.wait()
2167 if f:
2168 die("Error from p4 print for %s: %s" % (f, err))
2169 else:
2170 die("Error from p4 print: %s" % err)
2171
Andrew Garberc3f61632011-04-07 02:01:21 -04002172 if marshalled.has_key('depotFile') and self.stream_have_file_info:
2173 # start of a new file - output the old one first
2174 self.streamOneP4File(self.stream_file, self.stream_contents)
2175 self.stream_file = {}
2176 self.stream_contents = []
2177 self.stream_have_file_info = False
Luke Diamandb9327052009-07-30 00:13:46 +01002178
Andrew Garberc3f61632011-04-07 02:01:21 -04002179 # pick up the new file information... for the
2180 # 'data' field we need to append to our array
2181 for k in marshalled.keys():
2182 if k == 'data':
2183 self.stream_contents.append(marshalled['data'])
2184 else:
2185 self.stream_file[k] = marshalled[k]
Luke Diamandb9327052009-07-30 00:13:46 +01002186
Andrew Garberc3f61632011-04-07 02:01:21 -04002187 self.stream_have_file_info = True
Luke Diamandb9327052009-07-30 00:13:46 +01002188
2189 # Stream directly from "p4 files" into "git fast-import"
2190 def streamP4Files(self, files):
Simon Hausmann30b59402008-03-03 11:55:48 +01002191 filesForCommit = []
2192 filesToRead = []
Luke Diamandb9327052009-07-30 00:13:46 +01002193 filesToDelete = []
Simon Hausmann30b59402008-03-03 11:55:48 +01002194
Tor Arvid Lund3a70cdf2008-02-18 15:22:08 +01002195 for f in files:
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05002196 # if using a client spec, only add the files that have
2197 # a path in the client
2198 if self.clientSpecDirs:
2199 if self.clientSpecDirs.map_in_client(f['path']) == "":
2200 continue
Tor Arvid Lund3a70cdf2008-02-18 15:22:08 +01002201
Pete Wyckoffecb7cf92012-01-02 18:05:53 -05002202 filesForCommit.append(f)
2203 if f['action'] in self.delete_actions:
2204 filesToDelete.append(f)
2205 else:
2206 filesToRead.append(f)
Han-Wen Nienhuys6a49f8e2007-05-23 18:49:35 -03002207
Luke Diamandb9327052009-07-30 00:13:46 +01002208 # deleted files...
2209 for f in filesToDelete:
2210 self.streamOneP4Deletion(f)
2211
Simon Hausmann30b59402008-03-03 11:55:48 +01002212 if len(filesToRead) > 0:
Luke Diamandb9327052009-07-30 00:13:46 +01002213 self.stream_file = {}
2214 self.stream_contents = []
2215 self.stream_have_file_info = False
2216
Andrew Garberc3f61632011-04-07 02:01:21 -04002217 # curry self argument
2218 def streamP4FilesCbSelf(entry):
2219 self.streamP4FilesCb(entry)
Luke Diamandb9327052009-07-30 00:13:46 +01002220
Luke Diamand6de040d2011-10-16 10:47:52 -04002221 fileArgs = ['%s#%s' % (f['path'], f['rev']) for f in filesToRead]
2222
2223 p4CmdList(["-x", "-", "print"],
2224 stdin=fileArgs,
2225 cb=streamP4FilesCbSelf)
Han-Wen Nienhuysf2eda792007-05-23 18:49:35 -03002226
Luke Diamandb9327052009-07-30 00:13:46 +01002227 # do the last chunk
2228 if self.stream_file.has_key('depotFile'):
2229 self.streamOneP4File(self.stream_file, self.stream_contents)
Han-Wen Nienhuys6a49f8e2007-05-23 18:49:35 -03002230
Luke Diamandaffb4742012-01-19 09:52:27 +00002231 def make_email(self, userid):
2232 if userid in self.users:
2233 return self.users[userid]
2234 else:
2235 return "%s <a@b>" % userid
2236
Luke Diamand06804c72012-04-11 17:21:24 +02002237 # Stream a p4 tag
2238 def streamTag(self, gitStream, labelName, labelDetails, commit, epoch):
2239 if verbose:
2240 print "writing tag %s for commit %s" % (labelName, commit)
2241 gitStream.write("tag %s\n" % labelName)
2242 gitStream.write("from %s\n" % commit)
2243
2244 if labelDetails.has_key('Owner'):
2245 owner = labelDetails["Owner"]
2246 else:
2247 owner = None
2248
2249 # Try to use the owner of the p4 label, or failing that,
2250 # the current p4 user id.
2251 if owner:
2252 email = self.make_email(owner)
2253 else:
2254 email = self.make_email(self.p4UserId())
2255 tagger = "%s %s %s" % (email, epoch, self.tz)
2256
2257 gitStream.write("tagger %s\n" % tagger)
2258
2259 print "labelDetails=",labelDetails
2260 if labelDetails.has_key('Description'):
2261 description = labelDetails['Description']
2262 else:
2263 description = 'Label from git p4'
2264
2265 gitStream.write("data %d\n" % len(description))
2266 gitStream.write(description)
2267 gitStream.write("\n")
2268
Pete Wyckoffe63231e2012-08-11 12:55:02 -04002269 def commit(self, details, files, branch, parent = ""):
Simon Hausmannb9847332007-03-20 20:54:23 +01002270 epoch = details["time"]
2271 author = details["user"]
2272
Simon Hausmann4b97ffb2007-05-18 21:45:23 +02002273 if self.verbose:
2274 print "commit into %s" % branch
2275
Han-Wen Nienhuys96e07dd2007-05-23 18:49:35 -03002276 # start with reading files; if that fails, we should not
2277 # create a commit.
2278 new_files = []
2279 for f in files:
Pete Wyckoffe63231e2012-08-11 12:55:02 -04002280 if [p for p in self.branchPrefixes if p4PathStartsWith(f['path'], p)]:
Han-Wen Nienhuys96e07dd2007-05-23 18:49:35 -03002281 new_files.append (f)
2282 else:
Tor Arvid Lundafa1dd92011-03-15 13:08:03 +01002283 sys.stderr.write("Ignoring file outside of prefix: %s\n" % f['path'])
Han-Wen Nienhuys96e07dd2007-05-23 18:49:35 -03002284
Kazuki Saitoh9d57c4a2013-08-30 19:02:06 +09002285 if self.clientSpecDirs:
2286 self.clientSpecDirs.update_client_spec_path_cache(files)
2287
Simon Hausmannb9847332007-03-20 20:54:23 +01002288 self.gitStream.write("commit %s\n" % branch)
Han-Wen Nienhuys6a49f8e2007-05-23 18:49:35 -03002289# gitStream.write("mark :%s\n" % details["change"])
Simon Hausmannb9847332007-03-20 20:54:23 +01002290 self.committedChanges.add(int(details["change"]))
2291 committer = ""
Simon Hausmannb607e712007-05-20 10:55:54 +02002292 if author not in self.users:
2293 self.getUserMapFromPerforceServer()
Luke Diamandaffb4742012-01-19 09:52:27 +00002294 committer = "%s %s %s" % (self.make_email(author), epoch, self.tz)
Simon Hausmannb9847332007-03-20 20:54:23 +01002295
2296 self.gitStream.write("committer %s\n" % committer)
2297
2298 self.gitStream.write("data <<EOT\n")
2299 self.gitStream.write(details["desc"])
Pete Wyckoffe63231e2012-08-11 12:55:02 -04002300 self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s" %
2301 (','.join(self.branchPrefixes), details["change"]))
Simon Hausmann6581de02007-06-11 10:01:58 +02002302 if len(details['options']) > 0:
2303 self.gitStream.write(": options = %s" % details['options'])
2304 self.gitStream.write("]\nEOT\n\n")
Simon Hausmannb9847332007-03-20 20:54:23 +01002305
2306 if len(parent) > 0:
Simon Hausmann4b97ffb2007-05-18 21:45:23 +02002307 if self.verbose:
2308 print "parent %s" % parent
Simon Hausmannb9847332007-03-20 20:54:23 +01002309 self.gitStream.write("from %s\n" % parent)
2310
Luke Diamandb9327052009-07-30 00:13:46 +01002311 self.streamP4Files(new_files)
Simon Hausmannb9847332007-03-20 20:54:23 +01002312 self.gitStream.write("\n")
2313
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002314 change = int(details["change"])
2315
Simon Hausmann9bda3a82007-05-19 12:05:40 +02002316 if self.labels.has_key(change):
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002317 label = self.labels[change]
2318 labelDetails = label[0]
2319 labelRevisions = label[1]
Simon Hausmann71b112d2007-05-19 11:54:11 +02002320 if self.verbose:
2321 print "Change %s is labelled %s" % (change, labelDetails)
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002322
Luke Diamand6de040d2011-10-16 10:47:52 -04002323 files = p4CmdList(["files"] + ["%s...@%s" % (p, change)
Pete Wyckoffe63231e2012-08-11 12:55:02 -04002324 for p in self.branchPrefixes])
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002325
2326 if len(files) == len(labelRevisions):
2327
2328 cleanedFiles = {}
2329 for info in files:
Pete Wyckoff56c09342011-02-19 08:17:57 -05002330 if info["action"] in self.delete_actions:
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002331 continue
2332 cleanedFiles[info["depotFile"]] = info["rev"]
2333
2334 if cleanedFiles == labelRevisions:
Luke Diamand06804c72012-04-11 17:21:24 +02002335 self.streamTag(self.gitStream, 'tag_%s' % labelDetails['label'], labelDetails, branch, epoch)
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002336
2337 else:
Simon Hausmanna46668f2007-03-28 17:05:38 +02002338 if not self.silent:
Han-Wen Nienhuyscebdf5a2007-05-23 16:53:11 -03002339 print ("Tag %s does not match with change %s: files do not match."
2340 % (labelDetails["label"], change))
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002341
2342 else:
Simon Hausmanna46668f2007-03-28 17:05:38 +02002343 if not self.silent:
Han-Wen Nienhuyscebdf5a2007-05-23 16:53:11 -03002344 print ("Tag %s does not match with change %s: file count is different."
2345 % (labelDetails["label"], change))
Simon Hausmannb9847332007-03-20 20:54:23 +01002346
Luke Diamand06804c72012-04-11 17:21:24 +02002347 # Build a dictionary of changelists and labels, for "detect-labels" option.
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002348 def getLabels(self):
2349 self.labels = {}
2350
Luke Diamand52a48802012-01-19 09:52:25 +00002351 l = p4CmdList(["labels"] + ["%s..." % p for p in self.depotPaths])
Simon Hausmann10c32112007-04-08 10:15:47 +02002352 if len(l) > 0 and not self.silent:
Shun Kei Leung183f8432007-11-21 11:01:19 +08002353 print "Finding files belonging to labels in %s" % `self.depotPaths`
Simon Hausmann01ce1fe2007-04-07 23:46:50 +02002354
2355 for output in l:
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002356 label = output["label"]
2357 revisions = {}
2358 newestChange = 0
Simon Hausmann71b112d2007-05-19 11:54:11 +02002359 if self.verbose:
2360 print "Querying files for label %s" % label
Luke Diamand6de040d2011-10-16 10:47:52 -04002361 for file in p4CmdList(["files"] +
2362 ["%s...@%s" % (p, label)
2363 for p in self.depotPaths]):
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002364 revisions[file["depotFile"]] = file["rev"]
2365 change = int(file["change"])
2366 if change > newestChange:
2367 newestChange = change
2368
Simon Hausmann9bda3a82007-05-19 12:05:40 +02002369 self.labels[newestChange] = [output, revisions]
2370
2371 if self.verbose:
2372 print "Label changes: %s" % self.labels.keys()
Simon Hausmann1f4ba1c2007-03-26 22:34:34 +02002373
Luke Diamand06804c72012-04-11 17:21:24 +02002374 # Import p4 labels as git tags. A direct mapping does not
2375 # exist, so assume that if all the files are at the same revision
2376 # then we can use that, or it's something more complicated we should
2377 # just ignore.
2378 def importP4Labels(self, stream, p4Labels):
2379 if verbose:
2380 print "import p4 labels: " + ' '.join(p4Labels)
2381
2382 ignoredP4Labels = gitConfigList("git-p4.ignoredP4Labels")
Luke Diamandc8942a22012-04-11 17:21:24 +02002383 validLabelRegexp = gitConfig("git-p4.labelImportRegexp")
Luke Diamand06804c72012-04-11 17:21:24 +02002384 if len(validLabelRegexp) == 0:
2385 validLabelRegexp = defaultLabelRegexp
2386 m = re.compile(validLabelRegexp)
2387
2388 for name in p4Labels:
2389 commitFound = False
2390
2391 if not m.match(name):
2392 if verbose:
2393 print "label %s does not match regexp %s" % (name,validLabelRegexp)
2394 continue
2395
2396 if name in ignoredP4Labels:
2397 continue
2398
2399 labelDetails = p4CmdList(['label', "-o", name])[0]
2400
2401 # get the most recent changelist for each file in this label
2402 change = p4Cmd(["changes", "-m", "1"] + ["%s...@%s" % (p, name)
2403 for p in self.depotPaths])
2404
2405 if change.has_key('change'):
2406 # find the corresponding git commit; take the oldest commit
2407 changelist = int(change['change'])
2408 gitCommit = read_pipe(["git", "rev-list", "--max-count=1",
2409 "--reverse", ":/\[git-p4:.*change = %d\]" % changelist])
2410 if len(gitCommit) == 0:
2411 print "could not find git commit for changelist %d" % changelist
2412 else:
2413 gitCommit = gitCommit.strip()
2414 commitFound = True
2415 # Convert from p4 time format
2416 try:
2417 tmwhen = time.strptime(labelDetails['Update'], "%Y/%m/%d %H:%M:%S")
2418 except ValueError:
Pete Wyckoffa4e90542012-11-23 17:35:38 -05002419 print "Could not convert label time %s" % labelDetails['Update']
Luke Diamand06804c72012-04-11 17:21:24 +02002420 tmwhen = 1
2421
2422 when = int(time.mktime(tmwhen))
2423 self.streamTag(stream, name, labelDetails, gitCommit, when)
2424 if verbose:
2425 print "p4 label %s mapped to git commit %s" % (name, gitCommit)
2426 else:
2427 if verbose:
2428 print "Label %s has no changelists - possibly deleted?" % name
2429
2430 if not commitFound:
2431 # We can't import this label; don't try again as it will get very
2432 # expensive repeatedly fetching all the files for labels that will
2433 # never be imported. If the label is moved in the future, the
2434 # ignore will need to be removed manually.
2435 system(["git", "config", "--add", "git-p4.ignoredP4Labels", name])
2436
Han-Wen Nienhuys86dff6b2007-05-23 18:49:35 -03002437 def guessProjectName(self):
2438 for p in self.depotPaths:
Simon Hausmann6e5295c2007-06-11 08:50:57 +02002439 if p.endswith("/"):
2440 p = p[:-1]
2441 p = p[p.strip().rfind("/") + 1:]
2442 if not p.endswith("/"):
2443 p += "/"
2444 return p
Han-Wen Nienhuys86dff6b2007-05-23 18:49:35 -03002445
Simon Hausmann4b97ffb2007-05-18 21:45:23 +02002446 def getBranchMapping(self):
Simon Hausmann6555b2c2007-06-17 11:25:34 +02002447 lostAndFoundBranches = set()
2448
Vitor Antunes8ace74c2011-08-19 00:44:04 +01002449 user = gitConfig("git-p4.branchUser")
2450 if len(user) > 0:
2451 command = "branches -u %s" % user
2452 else:
2453 command = "branches"
2454
2455 for info in p4CmdList(command):
Luke Diamand52a48802012-01-19 09:52:25 +00002456 details = p4Cmd(["branch", "-o", info["branch"]])
Simon Hausmann4b97ffb2007-05-18 21:45:23 +02002457 viewIdx = 0
2458 while details.has_key("View%s" % viewIdx):
2459 paths = details["View%s" % viewIdx].split(" ")
2460 viewIdx = viewIdx + 1
2461 # require standard //depot/foo/... //depot/bar/... mapping
2462 if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."):
2463 continue
2464 source = paths[0]
2465 destination = paths[1]
Simon Hausmann6509e192007-06-07 09:41:53 +02002466 ## HACK
Tor Arvid Lundd53de8b2011-03-15 13:08:02 +01002467 if p4PathStartsWith(source, self.depotPaths[0]) and p4PathStartsWith(destination, self.depotPaths[0]):
Simon Hausmann6509e192007-06-07 09:41:53 +02002468 source = source[len(self.depotPaths[0]):-4]
2469 destination = destination[len(self.depotPaths[0]):-4]
Simon Hausmann6555b2c2007-06-17 11:25:34 +02002470
Simon Hausmann1a2edf42007-06-17 15:10:24 +02002471 if destination in self.knownBranches:
2472 if not self.silent:
2473 print "p4 branch %s defines a mapping from %s to %s" % (info["branch"], source, destination)
2474 print "but there exists another mapping from %s to %s already!" % (self.knownBranches[destination], destination)
2475 continue
2476
Simon Hausmann6555b2c2007-06-17 11:25:34 +02002477 self.knownBranches[destination] = source
2478
2479 lostAndFoundBranches.discard(destination)
2480
Simon Hausmann29bdbac2007-05-19 10:23:12 +02002481 if source not in self.knownBranches:
Simon Hausmann6555b2c2007-06-17 11:25:34 +02002482 lostAndFoundBranches.add(source)
2483
Vitor Antunes7199cf12011-08-19 00:44:05 +01002484 # Perforce does not strictly require branches to be defined, so we also
2485 # check git config for a branch list.
2486 #
2487 # Example of branch definition in git config file:
2488 # [git-p4]
2489 # branchList=main:branchA
2490 # branchList=main:branchB
2491 # branchList=branchA:branchC
2492 configBranches = gitConfigList("git-p4.branchList")
2493 for branch in configBranches:
2494 if branch:
2495 (source, destination) = branch.split(":")
2496 self.knownBranches[destination] = source
2497
2498 lostAndFoundBranches.discard(destination)
2499
2500 if source not in self.knownBranches:
2501 lostAndFoundBranches.add(source)
2502
Simon Hausmann6555b2c2007-06-17 11:25:34 +02002503
2504 for branch in lostAndFoundBranches:
2505 self.knownBranches[branch] = branch
Simon Hausmann29bdbac2007-05-19 10:23:12 +02002506
Simon Hausmann38f9f5e2007-11-15 10:38:45 +01002507 def getBranchMappingFromGitBranches(self):
2508 branches = p4BranchesInGit(self.importIntoRemotes)
2509 for branch in branches.keys():
2510 if branch == "master":
2511 branch = "main"
2512 else:
2513 branch = branch[len(self.projectName):]
2514 self.knownBranches[branch] = branch
2515
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03002516 def updateOptionDict(self, d):
2517 option_keys = {}
2518 if self.keepRepoPath:
2519 option_keys['keepRepoPath'] = 1
2520
2521 d["options"] = ' '.join(sorted(option_keys.keys()))
2522
2523 def readOptions(self, d):
2524 self.keepRepoPath = (d.has_key('options')
2525 and ('keepRepoPath' in d['options']))
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002526
Simon Hausmann8134f692007-08-26 16:44:55 +02002527 def gitRefForBranch(self, branch):
2528 if branch == "main":
2529 return self.refPrefix + "master"
2530
2531 if len(branch) <= 0:
2532 return branch
2533
2534 return self.refPrefix + self.projectName + branch
2535
Simon Hausmann1ca3d712007-08-26 17:36:55 +02002536 def gitCommitByP4Change(self, ref, change):
2537 if self.verbose:
2538 print "looking in ref " + ref + " for change %s using bisect..." % change
2539
2540 earliestCommit = ""
2541 latestCommit = parseRevision(ref)
2542
2543 while True:
2544 if self.verbose:
2545 print "trying: earliest %s latest %s" % (earliestCommit, latestCommit)
2546 next = read_pipe("git rev-list --bisect %s %s" % (latestCommit, earliestCommit)).strip()
2547 if len(next) == 0:
2548 if self.verbose:
2549 print "argh"
2550 return ""
2551 log = extractLogMessageFromGitCommit(next)
2552 settings = extractSettingsGitLog(log)
2553 currentChange = int(settings['change'])
2554 if self.verbose:
2555 print "current change %s" % currentChange
2556
2557 if currentChange == change:
2558 if self.verbose:
2559 print "found %s" % next
2560 return next
2561
2562 if currentChange < change:
2563 earliestCommit = "^%s" % next
2564 else:
2565 latestCommit = "%s" % next
2566
2567 return ""
2568
2569 def importNewBranch(self, branch, maxChange):
2570 # make fast-import flush all changes to disk and update the refs using the checkpoint
2571 # command so that we can try to find the branch parent in the git history
2572 self.gitStream.write("checkpoint\n\n");
2573 self.gitStream.flush();
2574 branchPrefix = self.depotPaths[0] + branch + "/"
2575 range = "@1,%s" % maxChange
2576 #print "prefix" + branchPrefix
2577 changes = p4ChangesForPaths([branchPrefix], range)
2578 if len(changes) <= 0:
2579 return False
2580 firstChange = changes[0]
2581 #print "first change in branch: %s" % firstChange
2582 sourceBranch = self.knownBranches[branch]
2583 sourceDepotPath = self.depotPaths[0] + sourceBranch
2584 sourceRef = self.gitRefForBranch(sourceBranch)
2585 #print "source " + sourceBranch
2586
Luke Diamand52a48802012-01-19 09:52:25 +00002587 branchParentChange = int(p4Cmd(["changes", "-m", "1", "%s...@1,%s" % (sourceDepotPath, firstChange)])["change"])
Simon Hausmann1ca3d712007-08-26 17:36:55 +02002588 #print "branch parent: %s" % branchParentChange
2589 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)
2590 if len(gitParent) > 0:
2591 self.initialParents[self.gitRefForBranch(branch)] = gitParent
2592 #print "parent git commit: %s" % gitParent
2593
2594 self.importChanges(changes)
2595 return True
2596
Vitor Antunesfed23692012-01-25 23:48:22 +00002597 def searchParent(self, parent, branch, target):
2598 parentFound = False
Pete Wyckoffc7d34882013-01-26 22:11:21 -05002599 for blob in read_pipe_lines(["git", "rev-list", "--reverse",
2600 "--no-merges", parent]):
Vitor Antunesfed23692012-01-25 23:48:22 +00002601 blob = blob.strip()
2602 if len(read_pipe(["git", "diff-tree", blob, target])) == 0:
2603 parentFound = True
2604 if self.verbose:
2605 print "Found parent of %s in commit %s" % (branch, blob)
2606 break
2607 if parentFound:
2608 return blob
2609 else:
2610 return None
2611
Simon Hausmanne87f37a2007-08-26 16:00:52 +02002612 def importChanges(self, changes):
2613 cnt = 1
2614 for change in changes:
Pete Wyckoff18fa13d2012-11-23 17:35:34 -05002615 description = p4_describe(change)
Simon Hausmanne87f37a2007-08-26 16:00:52 +02002616 self.updateOptionDict(description)
2617
2618 if not self.silent:
2619 sys.stdout.write("\rImporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
2620 sys.stdout.flush()
2621 cnt = cnt + 1
2622
2623 try:
2624 if self.detectBranches:
2625 branches = self.splitFilesIntoBranches(description)
2626 for branch in branches.keys():
2627 ## HACK --hwn
2628 branchPrefix = self.depotPaths[0] + branch + "/"
Pete Wyckoffe63231e2012-08-11 12:55:02 -04002629 self.branchPrefixes = [ branchPrefix ]
Simon Hausmanne87f37a2007-08-26 16:00:52 +02002630
2631 parent = ""
2632
2633 filesForCommit = branches[branch]
2634
2635 if self.verbose:
2636 print "branch is %s" % branch
2637
2638 self.updatedBranches.add(branch)
2639
2640 if branch not in self.createdBranches:
2641 self.createdBranches.add(branch)
2642 parent = self.knownBranches[branch]
2643 if parent == branch:
2644 parent = ""
Simon Hausmann1ca3d712007-08-26 17:36:55 +02002645 else:
2646 fullBranch = self.projectName + branch
2647 if fullBranch not in self.p4BranchesInGit:
2648 if not self.silent:
2649 print("\n Importing new branch %s" % fullBranch);
2650 if self.importNewBranch(branch, change - 1):
2651 parent = ""
2652 self.p4BranchesInGit.append(fullBranch)
2653 if not self.silent:
2654 print("\n Resuming with change %s" % change);
2655
2656 if self.verbose:
2657 print "parent determined through known branches: %s" % parent
Simon Hausmanne87f37a2007-08-26 16:00:52 +02002658
Simon Hausmann8134f692007-08-26 16:44:55 +02002659 branch = self.gitRefForBranch(branch)
2660 parent = self.gitRefForBranch(parent)
Simon Hausmanne87f37a2007-08-26 16:00:52 +02002661
2662 if self.verbose:
2663 print "looking for initial parent for %s; current parent is %s" % (branch, parent)
2664
2665 if len(parent) == 0 and branch in self.initialParents:
2666 parent = self.initialParents[branch]
2667 del self.initialParents[branch]
2668
Vitor Antunesfed23692012-01-25 23:48:22 +00002669 blob = None
2670 if len(parent) > 0:
Pete Wyckoff4f9273d2013-01-26 22:11:04 -05002671 tempBranch = "%s/%d" % (self.tempBranchLocation, change)
Vitor Antunesfed23692012-01-25 23:48:22 +00002672 if self.verbose:
2673 print "Creating temporary branch: " + tempBranch
Pete Wyckoffe63231e2012-08-11 12:55:02 -04002674 self.commit(description, filesForCommit, tempBranch)
Vitor Antunesfed23692012-01-25 23:48:22 +00002675 self.tempBranches.append(tempBranch)
2676 self.checkpoint()
2677 blob = self.searchParent(parent, branch, tempBranch)
2678 if blob:
Pete Wyckoffe63231e2012-08-11 12:55:02 -04002679 self.commit(description, filesForCommit, branch, blob)
Vitor Antunesfed23692012-01-25 23:48:22 +00002680 else:
2681 if self.verbose:
2682 print "Parent of %s not found. Committing into head of %s" % (branch, parent)
Pete Wyckoffe63231e2012-08-11 12:55:02 -04002683 self.commit(description, filesForCommit, branch, parent)
Simon Hausmanne87f37a2007-08-26 16:00:52 +02002684 else:
2685 files = self.extractFilesFromCommit(description)
Pete Wyckoffe63231e2012-08-11 12:55:02 -04002686 self.commit(description, files, self.branch,
Simon Hausmanne87f37a2007-08-26 16:00:52 +02002687 self.initialParent)
Pete Wyckoff47497842013-01-14 19:47:04 -05002688 # only needed once, to connect to the previous commit
Simon Hausmanne87f37a2007-08-26 16:00:52 +02002689 self.initialParent = ""
2690 except IOError:
2691 print self.gitError.read()
2692 sys.exit(1)
2693
Simon Hausmannc208a242007-08-26 16:07:18 +02002694 def importHeadRevision(self, revision):
2695 print "Doing initial import of %s from revision %s into %s" % (' '.join(self.depotPaths), revision, self.branch)
2696
Pete Wyckoff4e2e6ce2011-07-31 09:45:55 -04002697 details = {}
2698 details["user"] = "git perforce import user"
Pete Wyckoff1494fcb2011-02-19 08:17:56 -05002699 details["desc"] = ("Initial import of %s from the state at revision %s\n"
Simon Hausmannc208a242007-08-26 16:07:18 +02002700 % (' '.join(self.depotPaths), revision))
2701 details["change"] = revision
2702 newestRevision = 0
2703
2704 fileCnt = 0
Luke Diamand6de040d2011-10-16 10:47:52 -04002705 fileArgs = ["%s...%s" % (p,revision) for p in self.depotPaths]
2706
2707 for info in p4CmdList(["files"] + fileArgs):
Simon Hausmannc208a242007-08-26 16:07:18 +02002708
Pete Wyckoff68b28592011-02-19 08:17:55 -05002709 if 'code' in info and info['code'] == 'error':
Simon Hausmannc208a242007-08-26 16:07:18 +02002710 sys.stderr.write("p4 returned an error: %s\n"
2711 % info['data'])
Pete Wyckoffd88e7072011-02-19 08:17:58 -05002712 if info['data'].find("must refer to client") >= 0:
2713 sys.stderr.write("This particular p4 error is misleading.\n")
2714 sys.stderr.write("Perhaps the depot path was misspelled.\n");
2715 sys.stderr.write("Depot path: %s\n" % " ".join(self.depotPaths))
Simon Hausmannc208a242007-08-26 16:07:18 +02002716 sys.exit(1)
Pete Wyckoff68b28592011-02-19 08:17:55 -05002717 if 'p4ExitCode' in info:
2718 sys.stderr.write("p4 exitcode: %s\n" % info['p4ExitCode'])
Simon Hausmannc208a242007-08-26 16:07:18 +02002719 sys.exit(1)
2720
2721
2722 change = int(info["change"])
2723 if change > newestRevision:
2724 newestRevision = change
2725
Pete Wyckoff56c09342011-02-19 08:17:57 -05002726 if info["action"] in self.delete_actions:
Simon Hausmannc208a242007-08-26 16:07:18 +02002727 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
2728 #fileCnt = fileCnt + 1
2729 continue
2730
2731 for prop in ["depotFile", "rev", "action", "type" ]:
2732 details["%s%s" % (prop, fileCnt)] = info[prop]
2733
2734 fileCnt = fileCnt + 1
2735
2736 details["change"] = newestRevision
Pete Wyckoff4e2e6ce2011-07-31 09:45:55 -04002737
Pete Wyckoff9dcb9f22012-04-08 20:18:01 -04002738 # Use time from top-most change so that all git p4 clones of
Pete Wyckoff4e2e6ce2011-07-31 09:45:55 -04002739 # the same p4 repo have the same commit SHA1s.
Pete Wyckoff18fa13d2012-11-23 17:35:34 -05002740 res = p4_describe(newestRevision)
2741 details["time"] = res["time"]
Pete Wyckoff4e2e6ce2011-07-31 09:45:55 -04002742
Simon Hausmannc208a242007-08-26 16:07:18 +02002743 self.updateOptionDict(details)
2744 try:
Pete Wyckoffe63231e2012-08-11 12:55:02 -04002745 self.commit(details, self.extractFilesFromCommit(details), self.branch)
Simon Hausmannc208a242007-08-26 16:07:18 +02002746 except IOError:
2747 print "IO error with git fast-import. Is your git version recent enough?"
2748 print self.gitError.read()
2749
2750
Simon Hausmannb9847332007-03-20 20:54:23 +01002751 def run(self, args):
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002752 self.depotPaths = []
Simon Hausmann179caeb2007-03-22 22:17:42 +01002753 self.changeRange = ""
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002754 self.previousDepotPaths = []
Pete Wyckoff991a2de2013-01-14 19:46:56 -05002755 self.hasOrigin = False
Han-Wen Nienhuysce6f33c2007-05-23 16:46:29 -03002756
Simon Hausmann29bdbac2007-05-19 10:23:12 +02002757 # map from branch depot path to parent branch
2758 self.knownBranches = {}
2759 self.initialParents = {}
Simon Hausmann179caeb2007-03-22 22:17:42 +01002760
Simon Hausmanna028a982007-05-23 00:03:08 +02002761 if self.importIntoRemotes:
2762 self.refPrefix = "refs/remotes/p4/"
2763 else:
Marius Storm-Olsendb775552007-06-07 15:13:59 +02002764 self.refPrefix = "refs/heads/p4/"
Simon Hausmanna028a982007-05-23 00:03:08 +02002765
Pete Wyckoff991a2de2013-01-14 19:46:56 -05002766 if self.syncWithOrigin:
2767 self.hasOrigin = originP4BranchesExist()
2768 if self.hasOrigin:
2769 if not self.silent:
2770 print 'Syncing with origin first, using "git fetch origin"'
2771 system("git fetch origin")
Simon Hausmann10f880f2007-05-24 22:28:28 +02002772
Pete Wyckoff5a8e84c2013-01-14 19:47:05 -05002773 branch_arg_given = bool(self.branch)
Simon Hausmann569d1bd2007-03-22 21:34:16 +01002774 if len(self.branch) == 0:
Marius Storm-Olsendb775552007-06-07 15:13:59 +02002775 self.branch = self.refPrefix + "master"
Simon Hausmanna028a982007-05-23 00:03:08 +02002776 if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
Simon Hausmann48df6fd2007-05-17 21:18:53 +02002777 system("git update-ref %s refs/heads/p4" % self.branch)
Pete Wyckoff55d12432013-01-14 19:46:59 -05002778 system("git branch -D p4")
Simon Hausmann179caeb2007-03-22 22:17:42 +01002779
Pete Wyckoffa93d33e2012-02-25 20:06:24 -05002780 # accept either the command-line option, or the configuration variable
2781 if self.useClientSpec:
2782 # will use this after clone to set the variable
2783 self.useClientSpec_from_options = True
2784 else:
Pete Wyckoff0d609032013-01-26 22:11:24 -05002785 if gitConfigBool("git-p4.useclientspec"):
Pete Wyckoff09fca772011-12-24 21:07:39 -05002786 self.useClientSpec = True
2787 if self.useClientSpec:
Pete Wyckoff543987b2012-02-25 20:06:25 -05002788 self.clientSpecDirs = getClientSpec()
Tor Arvid Lund3a70cdf2008-02-18 15:22:08 +01002789
Han-Wen Nienhuys6a49f8e2007-05-23 18:49:35 -03002790 # TODO: should always look at previous commits,
2791 # merge with previous imports, if possible.
2792 if args == []:
Simon Hausmannd414c742007-05-25 11:36:42 +02002793 if self.hasOrigin:
Simon Hausmann5ca44612007-08-24 17:44:16 +02002794 createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)
Pete Wyckoff3b650fc2013-01-14 19:46:58 -05002795
2796 # branches holds mapping from branch name to sha1
2797 branches = p4BranchesInGit(self.importIntoRemotes)
Pete Wyckoff8c9e8b62013-01-14 19:47:06 -05002798
2799 # restrict to just this one, disabling detect-branches
2800 if branch_arg_given:
2801 short = self.branch.split("/")[-1]
2802 if short in branches:
2803 self.p4BranchesInGit = [ short ]
2804 else:
2805 self.p4BranchesInGit = branches.keys()
Simon Hausmannabcd7902007-05-24 22:25:36 +02002806
2807 if len(self.p4BranchesInGit) > 1:
2808 if not self.silent:
2809 print "Importing from/into multiple branches"
2810 self.detectBranches = True
Pete Wyckoff8c9e8b62013-01-14 19:47:06 -05002811 for branch in branches.keys():
2812 self.initialParents[self.refPrefix + branch] = \
2813 branches[branch]
Simon Hausmann967f72e2007-03-23 09:30:41 +01002814
Simon Hausmann29bdbac2007-05-19 10:23:12 +02002815 if self.verbose:
2816 print "branches: %s" % self.p4BranchesInGit
2817
2818 p4Change = 0
2819 for branch in self.p4BranchesInGit:
Han-Wen Nienhuyscebdf5a2007-05-23 16:53:11 -03002820 logMsg = extractLogMessageFromGitCommit(self.refPrefix + branch)
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03002821
2822 settings = extractSettingsGitLog(logMsg)
Simon Hausmann29bdbac2007-05-19 10:23:12 +02002823
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03002824 self.readOptions(settings)
2825 if (settings.has_key('depot-paths')
2826 and settings.has_key ('change')):
2827 change = int(settings['change']) + 1
Simon Hausmann29bdbac2007-05-19 10:23:12 +02002828 p4Change = max(p4Change, change)
2829
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03002830 depotPaths = sorted(settings['depot-paths'])
2831 if self.previousDepotPaths == []:
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002832 self.previousDepotPaths = depotPaths
Simon Hausmann29bdbac2007-05-19 10:23:12 +02002833 else:
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002834 paths = []
2835 for (prev, cur) in zip(self.previousDepotPaths, depotPaths):
Vitor Antunes04d277b2011-08-19 00:44:03 +01002836 prev_list = prev.split("/")
2837 cur_list = cur.split("/")
2838 for i in range(0, min(len(cur_list), len(prev_list))):
2839 if cur_list[i] <> prev_list[i]:
Simon Hausmann583e1702007-06-07 09:37:13 +02002840 i = i - 1
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002841 break
2842
Vitor Antunes04d277b2011-08-19 00:44:03 +01002843 paths.append ("/".join(cur_list[:i + 1]))
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002844
2845 self.previousDepotPaths = paths
Simon Hausmann29bdbac2007-05-19 10:23:12 +02002846
2847 if p4Change > 0:
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03002848 self.depotPaths = sorted(self.previousDepotPaths)
Simon Hausmannd5904672007-05-19 11:07:32 +02002849 self.changeRange = "@%s,#head" % p4Change
Simon Hausmann341dc1c2007-05-21 00:39:16 +02002850 if not self.silent and not self.detectBranches:
Simon Hausmann967f72e2007-03-23 09:30:41 +01002851 print "Performing incremental import into %s git branch" % self.branch
Simon Hausmann569d1bd2007-03-22 21:34:16 +01002852
Pete Wyckoff40d69ac2013-01-14 19:47:03 -05002853 # accept multiple ref name abbreviations:
2854 # refs/foo/bar/branch -> use it exactly
2855 # p4/branch -> prepend refs/remotes/ or refs/heads/
2856 # branch -> prepend refs/remotes/p4/ or refs/heads/p4/
Simon Hausmannf9162f62007-05-17 09:02:45 +02002857 if not self.branch.startswith("refs/"):
Pete Wyckoff40d69ac2013-01-14 19:47:03 -05002858 if self.importIntoRemotes:
2859 prepend = "refs/remotes/"
2860 else:
2861 prepend = "refs/heads/"
2862 if not self.branch.startswith("p4/"):
2863 prepend += "p4/"
2864 self.branch = prepend + self.branch
Simon Hausmann179caeb2007-03-22 22:17:42 +01002865
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002866 if len(args) == 0 and self.depotPaths:
Simon Hausmannb9847332007-03-20 20:54:23 +01002867 if not self.silent:
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002868 print "Depot paths: %s" % ' '.join(self.depotPaths)
Simon Hausmannb9847332007-03-20 20:54:23 +01002869 else:
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002870 if self.depotPaths and self.depotPaths != args:
Han-Wen Nienhuyscebdf5a2007-05-23 16:53:11 -03002871 print ("previous import used depot path %s and now %s was specified. "
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002872 "This doesn't work!" % (' '.join (self.depotPaths),
2873 ' '.join (args)))
Simon Hausmannb9847332007-03-20 20:54:23 +01002874 sys.exit(1)
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002875
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03002876 self.depotPaths = sorted(args)
Simon Hausmannb9847332007-03-20 20:54:23 +01002877
Simon Hausmann1c49fc12007-08-26 16:04:34 +02002878 revision = ""
Simon Hausmannb9847332007-03-20 20:54:23 +01002879 self.users = {}
Simon Hausmannb9847332007-03-20 20:54:23 +01002880
Pete Wyckoff58c8bc72011-12-24 21:07:35 -05002881 # Make sure no revision specifiers are used when --changesfile
2882 # is specified.
2883 bad_changesfile = False
2884 if len(self.changesFile) > 0:
2885 for p in self.depotPaths:
2886 if p.find("@") >= 0 or p.find("#") >= 0:
2887 bad_changesfile = True
2888 break
2889 if bad_changesfile:
2890 die("Option --changesfile is incompatible with revision specifiers")
2891
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002892 newPaths = []
2893 for p in self.depotPaths:
2894 if p.find("@") != -1:
2895 atIdx = p.index("@")
2896 self.changeRange = p[atIdx:]
2897 if self.changeRange == "@all":
2898 self.changeRange = ""
Han-Wen Nienhuys6a49f8e2007-05-23 18:49:35 -03002899 elif ',' not in self.changeRange:
Simon Hausmann1c49fc12007-08-26 16:04:34 +02002900 revision = self.changeRange
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002901 self.changeRange = ""
Han-Wen Nienhuys7fcff9d2007-07-23 15:56:37 -07002902 p = p[:atIdx]
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002903 elif p.find("#") != -1:
2904 hashIdx = p.index("#")
Simon Hausmann1c49fc12007-08-26 16:04:34 +02002905 revision = p[hashIdx:]
Han-Wen Nienhuys7fcff9d2007-07-23 15:56:37 -07002906 p = p[:hashIdx]
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002907 elif self.previousDepotPaths == []:
Pete Wyckoff58c8bc72011-12-24 21:07:35 -05002908 # pay attention to changesfile, if given, else import
2909 # the entire p4 tree at the head revision
2910 if len(self.changesFile) == 0:
2911 revision = "#head"
Simon Hausmannb9847332007-03-20 20:54:23 +01002912
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002913 p = re.sub ("\.\.\.$", "", p)
2914 if not p.endswith("/"):
2915 p += "/"
2916
2917 newPaths.append(p)
2918
2919 self.depotPaths = newPaths
2920
Pete Wyckoffe63231e2012-08-11 12:55:02 -04002921 # --detect-branches may change this for each branch
2922 self.branchPrefixes = self.depotPaths
2923
Simon Hausmannb607e712007-05-20 10:55:54 +02002924 self.loadUserMapFromCache()
Simon Hausmanncb53e1f2007-04-08 00:12:02 +02002925 self.labels = {}
2926 if self.detectLabels:
2927 self.getLabels();
Simon Hausmannb9847332007-03-20 20:54:23 +01002928
Simon Hausmann4b97ffb2007-05-18 21:45:23 +02002929 if self.detectBranches:
Simon Hausmanndf450922007-06-08 08:49:22 +02002930 ## FIXME - what's a P4 projectName ?
2931 self.projectName = self.guessProjectName()
2932
Simon Hausmann38f9f5e2007-11-15 10:38:45 +01002933 if self.hasOrigin:
2934 self.getBranchMappingFromGitBranches()
2935 else:
2936 self.getBranchMapping()
Simon Hausmann29bdbac2007-05-19 10:23:12 +02002937 if self.verbose:
2938 print "p4-git branches: %s" % self.p4BranchesInGit
2939 print "initial parents: %s" % self.initialParents
2940 for b in self.p4BranchesInGit:
2941 if b != "master":
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002942
2943 ## FIXME
Simon Hausmann29bdbac2007-05-19 10:23:12 +02002944 b = b[len(self.projectName):]
2945 self.createdBranches.add(b)
Simon Hausmann4b97ffb2007-05-18 21:45:23 +02002946
Simon Hausmannf291b4e2007-04-14 11:21:50 +02002947 self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
Simon Hausmannb9847332007-03-20 20:54:23 +01002948
Pete Wyckoff78189be2012-11-23 17:35:36 -05002949 self.importProcess = subprocess.Popen(["git", "fast-import"],
2950 stdin=subprocess.PIPE,
2951 stdout=subprocess.PIPE,
2952 stderr=subprocess.PIPE);
2953 self.gitOutput = self.importProcess.stdout
2954 self.gitStream = self.importProcess.stdin
2955 self.gitError = self.importProcess.stderr
Simon Hausmannb9847332007-03-20 20:54:23 +01002956
Simon Hausmann1c49fc12007-08-26 16:04:34 +02002957 if revision:
Simon Hausmannc208a242007-08-26 16:07:18 +02002958 self.importHeadRevision(revision)
Simon Hausmannb9847332007-03-20 20:54:23 +01002959 else:
2960 changes = []
2961
Simon Hausmann0828ab12007-03-20 20:59:30 +01002962 if len(self.changesFile) > 0:
Simon Hausmannb9847332007-03-20 20:54:23 +01002963 output = open(self.changesFile).readlines()
Reilly Grant1d7367d2009-09-10 00:02:38 -07002964 changeSet = set()
Simon Hausmannb9847332007-03-20 20:54:23 +01002965 for line in output:
2966 changeSet.add(int(line))
2967
2968 for change in changeSet:
2969 changes.append(change)
2970
2971 changes.sort()
2972 else:
Pete Wyckoff9dcb9f22012-04-08 20:18:01 -04002973 # catch "git p4 sync" with no new branches, in a repo that
2974 # does not have any existing p4 branches
Pete Wyckoff5a8e84c2013-01-14 19:47:05 -05002975 if len(args) == 0:
2976 if not self.p4BranchesInGit:
2977 die("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here.")
2978
2979 # The default branch is master, unless --branch is used to
2980 # specify something else. Make sure it exists, or complain
2981 # nicely about how to use --branch.
2982 if not self.detectBranches:
2983 if not branch_exists(self.branch):
2984 if branch_arg_given:
2985 die("Error: branch %s does not exist." % self.branch)
2986 else:
2987 die("Error: no branch %s; perhaps specify one with --branch." %
2988 self.branch)
2989
Simon Hausmann29bdbac2007-05-19 10:23:12 +02002990 if self.verbose:
Han-Wen Nienhuys86dff6b2007-05-23 18:49:35 -03002991 print "Getting p4 changes for %s...%s" % (', '.join(self.depotPaths),
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03002992 self.changeRange)
Simon Hausmann4f6432d2007-08-26 15:56:36 +02002993 changes = p4ChangesForPaths(self.depotPaths, self.changeRange)
Simon Hausmannb9847332007-03-20 20:54:23 +01002994
Simon Hausmann01a9c9c2007-05-23 00:07:35 +02002995 if len(self.maxChanges) > 0:
Han-Wen Nienhuys7fcff9d2007-07-23 15:56:37 -07002996 changes = changes[:min(int(self.maxChanges), len(changes))]
Simon Hausmann01a9c9c2007-05-23 00:07:35 +02002997
Simon Hausmannb9847332007-03-20 20:54:23 +01002998 if len(changes) == 0:
Simon Hausmann0828ab12007-03-20 20:59:30 +01002999 if not self.silent:
Simon Hausmann341dc1c2007-05-21 00:39:16 +02003000 print "No changes to import!"
Luke Diamand06804c72012-04-11 17:21:24 +02003001 else:
3002 if not self.silent and not self.detectBranches:
3003 print "Import destination: %s" % self.branch
Simon Hausmannb9847332007-03-20 20:54:23 +01003004
Luke Diamand06804c72012-04-11 17:21:24 +02003005 self.updatedBranches = set()
Simon Hausmanna9d1a272007-06-11 23:28:03 +02003006
Pete Wyckoff47497842013-01-14 19:47:04 -05003007 if not self.detectBranches:
3008 if args:
3009 # start a new branch
3010 self.initialParent = ""
3011 else:
3012 # build on a previous revision
3013 self.initialParent = parseRevision(self.branch)
3014
Luke Diamand06804c72012-04-11 17:21:24 +02003015 self.importChanges(changes)
Simon Hausmann341dc1c2007-05-21 00:39:16 +02003016
Luke Diamand06804c72012-04-11 17:21:24 +02003017 if not self.silent:
3018 print ""
3019 if len(self.updatedBranches) > 0:
3020 sys.stdout.write("Updated branches: ")
3021 for b in self.updatedBranches:
3022 sys.stdout.write("%s " % b)
3023 sys.stdout.write("\n")
Simon Hausmannb9847332007-03-20 20:54:23 +01003024
Pete Wyckoff0d609032013-01-26 22:11:24 -05003025 if gitConfigBool("git-p4.importLabels"):
Luke Diamand06dcd152012-05-11 07:25:18 +01003026 self.importLabels = True
Luke Diamand06804c72012-04-11 17:21:24 +02003027
3028 if self.importLabels:
3029 p4Labels = getP4Labels(self.depotPaths)
3030 gitTags = getGitTags()
3031
3032 missingP4Labels = p4Labels - gitTags
3033 self.importP4Labels(self.gitStream, missingP4Labels)
Simon Hausmannb9847332007-03-20 20:54:23 +01003034
Simon Hausmannb9847332007-03-20 20:54:23 +01003035 self.gitStream.close()
Pete Wyckoff78189be2012-11-23 17:35:36 -05003036 if self.importProcess.wait() != 0:
Simon Hausmann29bdbac2007-05-19 10:23:12 +02003037 die("fast-import failed: %s" % self.gitError.read())
Simon Hausmannb9847332007-03-20 20:54:23 +01003038 self.gitOutput.close()
3039 self.gitError.close()
3040
Vitor Antunesfed23692012-01-25 23:48:22 +00003041 # Cleanup temporary branches created during import
3042 if self.tempBranches != []:
3043 for branch in self.tempBranches:
3044 read_pipe("git update-ref -d %s" % branch)
3045 os.rmdir(os.path.join(os.environ.get("GIT_DIR", ".git"), self.tempBranchLocation))
3046
Pete Wyckoff55d12432013-01-14 19:46:59 -05003047 # Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow
3048 # a convenient shortcut refname "p4".
3049 if self.importIntoRemotes:
3050 head_ref = self.refPrefix + "HEAD"
3051 if not gitBranchExists(head_ref) and gitBranchExists(self.branch):
3052 system(["git", "symbolic-ref", head_ref, self.branch])
3053
Simon Hausmannb9847332007-03-20 20:54:23 +01003054 return True
3055
Simon Hausmann01ce1fe2007-04-07 23:46:50 +02003056class P4Rebase(Command):
3057 def __init__(self):
3058 Command.__init__(self)
Luke Diamand06804c72012-04-11 17:21:24 +02003059 self.options = [
3060 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),
Luke Diamand06804c72012-04-11 17:21:24 +02003061 ]
Luke Diamand06804c72012-04-11 17:21:24 +02003062 self.importLabels = False
Han-Wen Nienhuyscebdf5a2007-05-23 16:53:11 -03003063 self.description = ("Fetches the latest revision from perforce and "
3064 + "rebases the current work (branch) against it")
Simon Hausmann01ce1fe2007-04-07 23:46:50 +02003065
3066 def run(self, args):
3067 sync = P4Sync()
Luke Diamand06804c72012-04-11 17:21:24 +02003068 sync.importLabels = self.importLabels
Simon Hausmann01ce1fe2007-04-07 23:46:50 +02003069 sync.run([])
Simon Hausmannd7e38682007-06-12 14:34:46 +02003070
Simon Hausmann14594f42007-08-22 09:07:15 +02003071 return self.rebase()
3072
3073 def rebase(self):
Simon Hausmann36ee4ee2008-01-07 14:21:45 +01003074 if os.system("git update-index --refresh") != 0:
3075 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.");
3076 if len(read_pipe("git diff-index HEAD --")) > 0:
Veres Lajosf7e604e2013-06-19 07:37:24 +02003077 die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
Simon Hausmann36ee4ee2008-01-07 14:21:45 +01003078
Simon Hausmannd7e38682007-06-12 14:34:46 +02003079 [upstream, settings] = findUpstreamBranchPoint()
3080 if len(upstream) == 0:
3081 die("Cannot find upstream branchpoint for rebase")
3082
3083 # the branchpoint may be p4/foo~3, so strip off the parent
3084 upstream = re.sub("~[0-9]+$", "", upstream)
3085
3086 print "Rebasing the current branch onto %s" % upstream
Han-Wen Nienhuysb25b2062007-05-23 18:49:35 -03003087 oldHead = read_pipe("git rev-parse HEAD").strip()
Simon Hausmannd7e38682007-06-12 14:34:46 +02003088 system("git rebase %s" % upstream)
Simon Hausmann1f52af62007-04-08 00:07:02 +02003089 system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
Simon Hausmann01ce1fe2007-04-07 23:46:50 +02003090 return True
3091
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003092class P4Clone(P4Sync):
3093 def __init__(self):
3094 P4Sync.__init__(self)
3095 self.description = "Creates a new git repository and imports from Perforce into it"
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003096 self.usage = "usage: %prog [options] //depot/path[@revRange]"
Tommy Thorn354081d2008-02-03 10:38:51 -08003097 self.options += [
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003098 optparse.make_option("--destination", dest="cloneDestination",
3099 action='store', default=None,
Tommy Thorn354081d2008-02-03 10:38:51 -08003100 help="where to leave result of the clone"),
3101 optparse.make_option("-/", dest="cloneExclude",
3102 action="append", type="string",
Pete Wyckoff38200072011-02-19 08:18:01 -05003103 help="exclude depot path"),
3104 optparse.make_option("--bare", dest="cloneBare",
3105 action="store_true", default=False),
Tommy Thorn354081d2008-02-03 10:38:51 -08003106 ]
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003107 self.cloneDestination = None
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003108 self.needsGit = False
Pete Wyckoff38200072011-02-19 08:18:01 -05003109 self.cloneBare = False
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003110
Tommy Thorn354081d2008-02-03 10:38:51 -08003111 # This is required for the "append" cloneExclude action
3112 def ensure_value(self, attr, value):
3113 if not hasattr(self, attr) or getattr(self, attr) is None:
3114 setattr(self, attr, value)
3115 return getattr(self, attr)
3116
Han-Wen Nienhuys6a49f8e2007-05-23 18:49:35 -03003117 def defaultDestination(self, args):
3118 ## TODO: use common prefix of args?
3119 depotPath = args[0]
3120 depotDir = re.sub("(@[^@]*)$", "", depotPath)
3121 depotDir = re.sub("(#[^#]*)$", "", depotDir)
Toby Allsopp053d9e42008-02-05 09:41:43 +13003122 depotDir = re.sub(r"\.\.\.$", "", depotDir)
Han-Wen Nienhuys6a49f8e2007-05-23 18:49:35 -03003123 depotDir = re.sub(r"/$", "", depotDir)
3124 return os.path.split(depotDir)[1]
3125
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003126 def run(self, args):
3127 if len(args) < 1:
3128 return False
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003129
3130 if self.keepRepoPath and not self.cloneDestination:
3131 sys.stderr.write("Must specify destination for --keep-path\n")
3132 sys.exit(1)
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003133
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003134 depotPaths = args
Simon Hausmann5e100b52007-06-07 21:12:25 +02003135
3136 if not self.cloneDestination and len(depotPaths) > 1:
3137 self.cloneDestination = depotPaths[-1]
3138 depotPaths = depotPaths[:-1]
3139
Tommy Thorn354081d2008-02-03 10:38:51 -08003140 self.cloneExclude = ["/"+p for p in self.cloneExclude]
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003141 for p in depotPaths:
3142 if not p.startswith("//"):
Pete Wyckoff0f487d32013-01-26 22:11:06 -05003143 sys.stderr.write('Depot paths must start with "//": %s\n' % p)
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003144 return False
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003145
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003146 if not self.cloneDestination:
Marius Storm-Olsen98ad4fa2007-06-07 15:08:33 +02003147 self.cloneDestination = self.defaultDestination(args)
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003148
Han-Wen Nienhuys86dff6b2007-05-23 18:49:35 -03003149 print "Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination)
Pete Wyckoff38200072011-02-19 08:18:01 -05003150
Kevin Greenc3bf3f12007-06-11 16:48:07 -04003151 if not os.path.exists(self.cloneDestination):
3152 os.makedirs(self.cloneDestination)
Robert Blum053fd0c2008-08-01 12:50:03 -07003153 chdir(self.cloneDestination)
Pete Wyckoff38200072011-02-19 08:18:01 -05003154
3155 init_cmd = [ "git", "init" ]
3156 if self.cloneBare:
3157 init_cmd.append("--bare")
Brandon Caseya235e852013-01-26 11:14:33 -08003158 retcode = subprocess.call(init_cmd)
3159 if retcode:
3160 raise CalledProcessError(retcode, init_cmd)
Pete Wyckoff38200072011-02-19 08:18:01 -05003161
Han-Wen Nienhuys6326aa52007-05-23 18:49:35 -03003162 if not P4Sync.run(self, depotPaths):
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003163 return False
Pete Wyckoffc5959562013-01-14 19:47:01 -05003164
3165 # create a master branch and check out a work tree
3166 if gitBranchExists(self.branch):
3167 system([ "git", "branch", "master", self.branch ])
3168 if not self.cloneBare:
3169 system([ "git", "checkout", "-f" ])
3170 else:
3171 print 'Not checking out any branch, use ' \
3172 '"git checkout -q -b master <branch>"'
Han-Wen Nienhuys86dff6b2007-05-23 18:49:35 -03003173
Pete Wyckoffa93d33e2012-02-25 20:06:24 -05003174 # auto-set this variable if invoked with --use-client-spec
3175 if self.useClientSpec_from_options:
3176 system("git config --bool git-p4.useclientspec true")
3177
Simon Hausmannf9a3a4f2007-04-08 10:08:26 +02003178 return True
3179
Simon Hausmann09d89de2007-06-20 23:10:28 +02003180class P4Branches(Command):
3181 def __init__(self):
3182 Command.__init__(self)
3183 self.options = [ ]
3184 self.description = ("Shows the git branches that hold imports and their "
3185 + "corresponding perforce depot paths")
3186 self.verbose = False
3187
3188 def run(self, args):
Simon Hausmann5ca44612007-08-24 17:44:16 +02003189 if originP4BranchesExist():
3190 createOrUpdateBranchesFromOrigin()
3191
Simon Hausmann09d89de2007-06-20 23:10:28 +02003192 cmdline = "git rev-parse --symbolic "
3193 cmdline += " --remotes"
3194
3195 for line in read_pipe_lines(cmdline):
3196 line = line.strip()
3197
3198 if not line.startswith('p4/') or line == "p4/HEAD":
3199 continue
3200 branch = line
3201
3202 log = extractLogMessageFromGitCommit("refs/remotes/%s" % branch)
3203 settings = extractSettingsGitLog(log)
3204
3205 print "%s <= %s (%s)" % (branch, ",".join(settings["depot-paths"]), settings["change"])
3206 return True
3207
Simon Hausmannb9847332007-03-20 20:54:23 +01003208class HelpFormatter(optparse.IndentedHelpFormatter):
3209 def __init__(self):
3210 optparse.IndentedHelpFormatter.__init__(self)
3211
3212 def format_description(self, description):
3213 if description:
3214 return description + "\n"
3215 else:
3216 return ""
Simon Hausmann4f5cf762007-03-19 22:25:17 +01003217
Simon Hausmann86949ee2007-03-19 20:59:12 +01003218def printUsage(commands):
3219 print "usage: %s <command> [options]" % sys.argv[0]
3220 print ""
3221 print "valid commands: %s" % ", ".join(commands)
3222 print ""
3223 print "Try %s <command> --help for command specific help." % sys.argv[0]
3224 print ""
3225
3226commands = {
Han-Wen Nienhuysb86f7372007-05-23 18:49:35 -03003227 "debug" : P4Debug,
3228 "submit" : P4Submit,
Marius Storm-Olsena9834f52007-10-09 16:16:09 +02003229 "commit" : P4Submit,
Han-Wen Nienhuysb86f7372007-05-23 18:49:35 -03003230 "sync" : P4Sync,
3231 "rebase" : P4Rebase,
3232 "clone" : P4Clone,
Simon Hausmann09d89de2007-06-20 23:10:28 +02003233 "rollback" : P4RollBack,
3234 "branches" : P4Branches
Simon Hausmann86949ee2007-03-19 20:59:12 +01003235}
3236
Simon Hausmann86949ee2007-03-19 20:59:12 +01003237
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003238def main():
3239 if len(sys.argv[1:]) == 0:
3240 printUsage(commands.keys())
3241 sys.exit(2)
Simon Hausmann86949ee2007-03-19 20:59:12 +01003242
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003243 cmdName = sys.argv[1]
3244 try:
Han-Wen Nienhuysb86f7372007-05-23 18:49:35 -03003245 klass = commands[cmdName]
3246 cmd = klass()
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003247 except KeyError:
3248 print "unknown command %s" % cmdName
3249 print ""
3250 printUsage(commands.keys())
3251 sys.exit(2)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01003252
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003253 options = cmd.options
Han-Wen Nienhuysb86f7372007-05-23 18:49:35 -03003254 cmd.gitdir = os.environ.get("GIT_DIR", None)
Simon Hausmann86949ee2007-03-19 20:59:12 +01003255
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003256 args = sys.argv[2:]
Simon Hausmanne20a9e52007-03-26 00:13:51 +02003257
Pete Wyckoffb0ccc802012-09-09 16:16:10 -04003258 options.append(optparse.make_option("--verbose", "-v", dest="verbose", action="store_true"))
Luke Diamand6a10b6a2012-04-24 09:33:23 +01003259 if cmd.needsGit:
3260 options.append(optparse.make_option("--git-dir", dest="gitdir"))
Simon Hausmanne20a9e52007-03-26 00:13:51 +02003261
Luke Diamand6a10b6a2012-04-24 09:33:23 +01003262 parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
3263 options,
3264 description = cmd.description,
3265 formatter = HelpFormatter())
Simon Hausmann86949ee2007-03-19 20:59:12 +01003266
Luke Diamand6a10b6a2012-04-24 09:33:23 +01003267 (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003268 global verbose
3269 verbose = cmd.verbose
3270 if cmd.needsGit:
Han-Wen Nienhuysb86f7372007-05-23 18:49:35 -03003271 if cmd.gitdir == None:
3272 cmd.gitdir = os.path.abspath(".git")
3273 if not isValidGitDir(cmd.gitdir):
3274 cmd.gitdir = read_pipe("git rev-parse --git-dir").strip()
3275 if os.path.exists(cmd.gitdir):
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003276 cdup = read_pipe("git rev-parse --show-cdup").strip()
3277 if len(cdup) > 0:
Robert Blum053fd0c2008-08-01 12:50:03 -07003278 chdir(cdup);
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003279
Han-Wen Nienhuysb86f7372007-05-23 18:49:35 -03003280 if not isValidGitDir(cmd.gitdir):
3281 if isValidGitDir(cmd.gitdir + "/.git"):
3282 cmd.gitdir += "/.git"
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003283 else:
Han-Wen Nienhuysb86f7372007-05-23 18:49:35 -03003284 die("fatal: cannot locate git repository at %s" % cmd.gitdir)
Simon Hausmann8910ac02007-03-26 08:18:55 +02003285
Han-Wen Nienhuysb86f7372007-05-23 18:49:35 -03003286 os.environ["GIT_DIR"] = cmd.gitdir
Simon Hausmann4f5cf762007-03-19 22:25:17 +01003287
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003288 if not cmd.run(args):
3289 parser.print_help()
Pete Wyckoff09fca772011-12-24 21:07:39 -05003290 sys.exit(2)
Simon Hausmann4f5cf762007-03-19 22:25:17 +01003291
Han-Wen Nienhuysbb6e09b2007-05-23 18:49:35 -03003292
3293if __name__ == '__main__':
3294 main()