🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v2.4.4 / . / git-p4.py
blob: 549022e97c83e4a2f1898dc005331e5bca3f0ded [file] [log] [blame]
Simon Hausmann86949ee2007-03-19 19:59:12[diff] [blame]1#!/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 12:43:25[diff] [blame]5# Author: Simon Hausmann <simon@lst.de>
6# Copyright: 2007 Simon Hausmann <simon@lst.de>
Simon Hausmann83dce552007-03-19 21:26:36[diff] [blame]7# 2007 Trolltech ASA
Simon Hausmann86949ee2007-03-19 19:59:12[diff] [blame]8# License: MIT <http://www.opensource.org/licenses/mit-license.php>
9#
Eric S. Raymonda33faf22012-12-28 16:40:59[diff] [blame]10import 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-27 03:11:05[diff] [blame]15import os
16import optparse
17import marshal
18import subprocess
19import tempfile
20import time
21import platform
22import re
23import shutil
Pete Wyckoffd20f0f82013-01-27 03:11:19[diff] [blame]24import stat
Han-Wen Nienhuys8b41a972007-05-23 21:20:53[diff] [blame]25
Brandon Caseya235e852013-01-26 19:14:33[diff] [blame]26try:
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 21:49:35[diff] [blame]41verbose = False
Simon Hausmann86949ee2007-03-19 19:59:12[diff] [blame]42
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]43# Only labels/tags matching this will be imported/exported
Luke Diamandc8942a22012-04-11 15:21:24[diff] [blame]44defaultLabelRegexp = r'[a-zA-Z0-9_\-.]+$'
Anand Kumria21a50752008-08-10 18:26:28[diff] [blame]45
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 14:47:52[diff] [blame]53 real_cmd = ["p4"]
Anand Kumriaabcaf072008-08-10 18:26:31[diff] [blame]54
55 user = gitConfig("git-p4.user")
56 if len(user) > 0:
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]57 real_cmd += ["-u",user]
Anand Kumriaabcaf072008-08-10 18:26:31[diff] [blame]58
59 password = gitConfig("git-p4.password")
60 if len(password) > 0:
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]61 real_cmd += ["-P", password]
Anand Kumriaabcaf072008-08-10 18:26:31[diff] [blame]62
63 port = gitConfig("git-p4.port")
64 if len(port) > 0:
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]65 real_cmd += ["-p", port]
Anand Kumriaabcaf072008-08-10 18:26:31[diff] [blame]66
67 host = gitConfig("git-p4.host")
68 if len(host) > 0:
Russell Myers41799aa2012-02-22 19:16:05[diff] [blame]69 real_cmd += ["-H", host]
Anand Kumriaabcaf072008-08-10 18:26:31[diff] [blame]70
71 client = gitConfig("git-p4.client")
72 if len(client) > 0:
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]73 real_cmd += ["-c", client]
Anand Kumriaabcaf072008-08-10 18:26:31[diff] [blame]74
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]75
76 if isinstance(cmd,basestring):
77 real_cmd = ' '.join(real_cmd) + ' ' + cmd
78 else:
79 real_cmd += cmd
Anand Kumria21a50752008-08-10 18:26:28[diff] [blame]80 return real_cmd
81
Miklós Fazekasbbd84862013-03-11 21:45:29[diff] [blame]82def 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 19:50:03[diff] [blame]103
Han-Wen Nienhuys86dff6b2007-05-23 21:49:35[diff] [blame]104def 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 14:47:52[diff] [blame]111def write_pipe(c, stdin):
Han-Wen Nienhuys4addad22007-05-23 21:49:35[diff] [blame]112 if verbose:
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]113 sys.stderr.write('Writing pipe: %s\n' % str(c))
Han-Wen Nienhuysb016d392007-05-23 20:10:46[diff] [blame]114
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]115 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 20:10:46[diff] [blame]122
123 return val
124
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]125def p4_write_pipe(c, stdin):
Anand Kumriad9429192008-08-14 22:40:38[diff] [blame]126 real_cmd = p4_build_cmd(c)
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]127 return write_pipe(real_cmd, stdin)
Anand Kumriad9429192008-08-14 22:40:38[diff] [blame]128
Han-Wen Nienhuys4addad22007-05-23 21:49:35[diff] [blame]129def read_pipe(c, ignore_error=False):
130 if verbose:
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]131 sys.stderr.write('Reading pipe: %s\n' % str(c))
Han-Wen Nienhuys8b41a972007-05-23 21:20:53[diff] [blame]132
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]133 expand = isinstance(c,basestring)
134 p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand)
135 pipe = p.stdout
Han-Wen Nienhuysb016d392007-05-23 20:10:46[diff] [blame]136 val = pipe.read()
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]137 if p.wait() and not ignore_error:
138 die('Command failed: %s' % str(c))
Han-Wen Nienhuysb016d392007-05-23 20:10:46[diff] [blame]139
140 return val
141
Anand Kumriad9429192008-08-14 22:40:38[diff] [blame]142def 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 20:10:46[diff] [blame]145
Han-Wen Nienhuysbce4c5f2007-05-23 20:14:33[diff] [blame]146def read_pipe_lines(c):
Han-Wen Nienhuys4addad22007-05-23 21:49:35[diff] [blame]147 if verbose:
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]148 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 20:10:46[diff] [blame]153 val = pipe.readlines()
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]154 if pipe.close() or p.wait():
155 die('Command failed: %s' % str(c))
Han-Wen Nienhuysb016d392007-05-23 20:10:46[diff] [blame]156
157 return val
Simon Hausmanncaace112007-05-15 12:57:57[diff] [blame]158
Anand Kumria23181212008-08-10 18:26:24[diff] [blame]159def p4_read_pipe_lines(c):
160 """Specifically invoke p4 on the command supplied. """
Anand Kumria155af832008-08-10 18:26:30[diff] [blame]161 real_cmd = p4_build_cmd(c)
Anand Kumria23181212008-08-10 18:26:24[diff] [blame]162 return read_pipe_lines(real_cmd)
163
Gary Gibbons8e9497c2012-07-12 23:29:00[diff] [blame]164def 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 22:35:35[diff] [blame]173def 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 20:41:50[diff] [blame]192def system(cmd):
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]193 expand = isinstance(cmd,basestring)
Han-Wen Nienhuys4addad22007-05-23 21:49:35[diff] [blame]194 if verbose:
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]195 sys.stderr.write("executing %s\n" % str(cmd))
Brandon Caseya235e852013-01-26 19:14:33[diff] [blame]196 retcode = subprocess.call(cmd, shell=expand)
197 if retcode:
198 raise CalledProcessError(retcode, cmd)
Han-Wen Nienhuys6754a292007-05-23 20:41:50[diff] [blame]199
Anand Kumriabf9320f2008-08-10 18:26:26[diff] [blame]200def p4_system(cmd):
201 """Specifically invoke p4 as the system command. """
Anand Kumria155af832008-08-10 18:26:30[diff] [blame]202 real_cmd = p4_build_cmd(cmd)
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]203 expand = isinstance(real_cmd, basestring)
Brandon Caseya235e852013-01-26 19:14:33[diff] [blame]204 retcode = subprocess.call(real_cmd, shell=expand)
205 if retcode:
206 raise CalledProcessError(retcode, real_cmd)
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]207
Pete Wyckoff7f0e5962013-01-27 03:11:13[diff] [blame]208_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 14:47:52[diff] [blame]224def p4_integrate(src, dest):
Pete Wyckoff9d7d4462012-04-30 00:57:17[diff] [blame]225 p4_system(["integrate", "-Dt", wildcard_encode(src), wildcard_encode(dest)])
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]226
Pete Wyckoff8d7ec362012-04-30 00:57:14[diff] [blame]227def p4_sync(f, *options):
Pete Wyckoff9d7d4462012-04-30 00:57:17[diff] [blame]228 p4_system(["sync"] + list(options) + [wildcard_encode(f)])
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]229
230def p4_add(f):
Pete Wyckoff9d7d4462012-04-30 00:57:17[diff] [blame]231 # 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 14:47:52[diff] [blame]236
237def p4_delete(f):
Pete Wyckoff9d7d4462012-04-30 00:57:17[diff] [blame]238 p4_system(["delete", wildcard_encode(f)])
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]239
240def p4_edit(f):
Pete Wyckoff9d7d4462012-04-30 00:57:17[diff] [blame]241 p4_system(["edit", wildcard_encode(f)])
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]242
243def p4_revert(f):
Pete Wyckoff9d7d4462012-04-30 00:57:17[diff] [blame]244 p4_system(["revert", wildcard_encode(f)])
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]245
Pete Wyckoff9d7d4462012-04-30 00:57:17[diff] [blame]246def p4_reopen(type, f):
247 p4_system(["reopen", "-t", type, wildcard_encode(f)])
Anand Kumriabf9320f2008-08-10 18:26:26[diff] [blame]248
Gary Gibbons8e9497c2012-07-12 23:29:00[diff] [blame]249def p4_move(src, dest):
250 p4_system(["move", "-k", wildcard_encode(src), wildcard_encode(dest)])
251
Pete Wyckoff18fa13d2012-11-23 22:35:34[diff] [blame]252def 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 14:45:01[diff] [blame]275#
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 20:12:48[diff] [blame]281
Pete Wyckoff9cffb8c2011-10-16 14:45:01[diff] [blame]282 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[diff] [blame]310#
311# return the raw p4 type of a file (text, text+ko, etc)
312#
Pete Wyckoff79467e62014-01-21 23:16:45[diff] [blame]313def p4_type(f):
314 results = p4CmdList(["fstat", "-T", "headType", wildcard_encode(f)])
Luke Diamand60df0712012-02-23 07:51:30[diff] [blame]315 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 22:04:02[diff] [blame]333 (:[^$\n]+)? # possibly an old expansion, followed by...
Luke Diamand60df0712012-02-23 07:51:30[diff] [blame]334 \$ # 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 20:12:48[diff] [blame]351
Chris Pettittc65b6702007-11-02 03:43:14[diff] [blame]352def 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 14:47:52[diff] [blame]365 p4_reopen(p4Type, file)
Chris Pettittc65b6702007-11-02 03:43:14[diff] [blame]366
367def getP4OpenedType(file):
368 # Returns the perforce file type for the given file.
369
Pete Wyckoff9d7d4462012-04-30 00:57:17[diff] [blame]370 result = p4_read_pipe(["opened", wildcard_encode(file)])
Marius Storm-Olsenf3e5ae42008-03-28 14:40:40[diff] [blame]371 match = re.match(".*\((.+)\)\r?$", result)
Chris Pettittc65b6702007-11-02 03:43:14[diff] [blame]372 if match:
373 return match.group(1)
374 else:
Marius Storm-Olsenf3e5ae42008-03-28 14:40:40[diff] [blame]375 die("Could not determine file type for %s (result: '%s')" % (file, result))
Chris Pettittc65b6702007-11-02 03:43:14[diff] [blame]376
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]377# 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-02 03:43:13[diff] [blame]397def 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-02 03:43:14[diff] [blame]437def 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-29 23:13:46[diff] [blame]445def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None):
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]446
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 21:49:35[diff] [blame]455 if verbose:
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]456 sys.stderr.write("Opening pipe: %s\n" % str(cmd))
Scott Lamb9f90c732007-07-16 03:58:10[diff] [blame]457
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 14:47:52[diff] [blame]464 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-16 03:58:10[diff] [blame]469 stdin_file.flush()
470 stdin_file.seek(0)
471
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]472 p4 = subprocess.Popen(cmd,
473 shell=expand,
Scott Lamb9f90c732007-07-16 03:58:10[diff] [blame]474 stdin=stdin_file,
475 stdout=subprocess.PIPE)
Simon Hausmann86949ee2007-03-19 19:59:12[diff] [blame]476
477 result = []
478 try:
479 while True:
Scott Lamb9f90c732007-07-16 03:58:10[diff] [blame]480 entry = marshal.load(p4.stdout)
Andrew Garberc3f61632011-04-07 06:01:21[diff] [blame]481 if cb is not None:
482 cb(entry)
483 else:
484 result.append(entry)
Simon Hausmann86949ee2007-03-19 19:59:12[diff] [blame]485 except EOFError:
486 pass
Scott Lamb9f90c732007-07-16 03:58:10[diff] [blame]487 exitCode = p4.wait()
488 if exitCode != 0:
Simon Hausmannac3e0d72007-05-23 21:32:32[diff] [blame]489 entry = {}
490 entry["p4ExitCode"] = exitCode
491 result.append(entry)
Simon Hausmann86949ee2007-03-19 19:59:12[diff] [blame]492
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 08:15:11[diff] [blame]502def p4Where(depotPath):
503 if not depotPath.endswith("/"):
504 depotPath += "/"
Tor Arvid Lund7f705dc2008-12-04 13:37:33[diff] [blame]505 depotPath = depotPath + "..."
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]506 outputList = p4CmdList(["where", depotPath])
Tor Arvid Lund7f705dc2008-12-04 13:37:33[diff] [blame]507 output = None
508 for entry in outputList:
Tor Arvid Lund75bc9572008-12-09 15:41:50[diff] [blame]509 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 13:37:33[diff] [blame]519 if output == None:
520 return ""
Simon Hausmanndc524032007-05-21 07:34:56[diff] [blame]521 if output["code"] == "error":
522 return ""
Simon Hausmanncb2c9db2007-03-24 08:15:11[diff] [blame]523 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 19:59:12[diff] [blame]535def currentGitBranch():
Han-Wen Nienhuysb25b2062007-05-23 21:49:35[diff] [blame]536 return read_pipe("git name-rev HEAD").split(" ")[1].strip()
Simon Hausmann86949ee2007-03-19 19:59:12[diff] [blame]537
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]538def isValidGitDir(path):
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]539 if (os.path.exists(path + "/HEAD")
540 and os.path.exists(path + "/refs") and os.path.exists(path + "/objects")):
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]541 return True;
542 return False
543
Simon Hausmann463e8af2007-05-17 07:13:54[diff] [blame]544def parseRevision(ref):
Han-Wen Nienhuysb25b2062007-05-23 21:49:35[diff] [blame]545 return read_pipe("git rev-parse %s" % ref).strip()
Simon Hausmann463e8af2007-05-17 07:13:54[diff] [blame]546
Pete Wyckoff28755db2011-12-25 02:07:40[diff] [blame]547def 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 20:10:25[diff] [blame]552def extractLogMessageFromGitCommit(commit):
553 logMessage = ""
Han-Wen Nienhuysb016d392007-05-23 20:10:46[diff] [blame]554
555 ## fixme: title is first line of commit, not 1st paragraph.
Simon Hausmann6ae8de82007-03-22 20:10:25[diff] [blame]556 foundTitle = False
Han-Wen Nienhuysb016d392007-05-23 20:10:46[diff] [blame]557 for log in read_pipe_lines("git cat-file commit %s" % commit):
Simon Hausmann6ae8de82007-03-22 20:10:25[diff] [blame]558 if not foundTitle:
559 if len(log) == 1:
Simon Hausmann1c094182007-05-01 21:15:48[diff] [blame]560 foundTitle = True
Simon Hausmann6ae8de82007-03-22 20:10:25[diff] [blame]561 continue
562
563 logMessage += log
564 return logMessage
565
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]566def extractSettingsGitLog(log):
Simon Hausmann6ae8de82007-03-22 20:10:25[diff] [blame]567 values = {}
568 for line in log.split("\n"):
569 line = line.strip()
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]570 m = re.search (r"^ *\[git-p4: (.*)\]$", line)
571 if not m:
572 continue
Simon Hausmann6ae8de82007-03-22 20:10:25[diff] [blame]573
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]574 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 07:19:34[diff] [blame]584 paths = values.get("depot-paths")
585 if not paths:
586 paths = values.get("depot-path")
Simon Hausmanna3fdd572007-06-07 20:54:32[diff] [blame]587 if paths:
588 values['depot-paths'] = paths.split(',')
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]589 return values
Simon Hausmann6ae8de82007-03-22 20:10:25[diff] [blame]590
Simon Hausmann8136a632007-03-22 20:27:14[diff] [blame]591def gitBranchExists(branch):
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]592 proc = subprocess.Popen(["git", "rev-parse", branch],
593 stderr=subprocess.PIPE, stdout=subprocess.PIPE);
Simon Hausmanncaace112007-05-15 12:57:57[diff] [blame]594 return proc.wait() == 0;
Simon Hausmann8136a632007-03-22 20:27:14[diff] [blame]595
John Chapman36bd8442008-11-08 03:22:49[diff] [blame]596_gitConfig = {}
Pete Wyckoffb345d6c2013-01-27 03:11:23[diff] [blame]597
Pete Wyckoff0d609032013-01-27 03:11:24[diff] [blame]598def gitConfig(key):
John Chapman36bd8442008-11-08 03:22:49[diff] [blame]599 if not _gitConfig.has_key(key):
Pete Wyckoff0d609032013-01-27 03:11:24[diff] [blame]600 cmd = [ "git", "config", key ]
Pete Wyckoffb345d6c2013-01-27 03:11:23[diff] [blame]601 s = read_pipe(cmd, ignore_error=True)
602 _gitConfig[key] = s.strip()
John Chapman36bd8442008-11-08 03:22:49[diff] [blame]603 return _gitConfig[key]
Simon Hausmann01265102007-05-25 08:36:10[diff] [blame]604
Pete Wyckoff0d609032013-01-27 03:11:24[diff] [blame]605def 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 08:56:31[diff] [blame]615 return _gitConfig[key]
616
Vitor Antunes7199cf12011-08-18 23:44:05[diff] [blame]617def gitConfigList(key):
618 if not _gitConfig.has_key(key):
Pete Wyckoff2abba302013-01-27 03:11:22[diff] [blame]619 s = read_pipe(["git", "config", "--get-all", key], ignore_error=True)
620 _gitConfig[key] = s.strip().split(os.linesep)
Vitor Antunes7199cf12011-08-18 23:44:05[diff] [blame]621 return _gitConfig[key]
622
Pete Wyckoff2c8037e2013-01-15 00:46:57[diff] [blame]623def 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 08:56:31[diff] [blame]630 branches = {}
631
632 cmdline = "git rev-parse --symbolic "
633 if branchesAreInRemotes:
Pete Wyckoff2c8037e2013-01-15 00:46:57[diff] [blame]634 cmdline += "--remotes"
Simon Hausmann062410b2007-07-18 08:56:31[diff] [blame]635 else:
Pete Wyckoff2c8037e2013-01-15 00:46:57[diff] [blame]636 cmdline += "--branches"
Simon Hausmann062410b2007-07-18 08:56:31[diff] [blame]637
638 for line in read_pipe_lines(cmdline):
639 line = line.strip()
640
Pete Wyckoff2c8037e2013-01-15 00:46:57[diff] [blame]641 # only import to p4/
642 if not line.startswith('p4/'):
Simon Hausmann062410b2007-07-18 08:56:31[diff] [blame]643 continue
Pete Wyckoff2c8037e2013-01-15 00:46:57[diff] [blame]644 # special symbolic ref to p4/master
645 if line == "p4/HEAD":
646 continue
Simon Hausmann062410b2007-07-18 08:56:31[diff] [blame]647
Pete Wyckoff2c8037e2013-01-15 00:46:57[diff] [blame]648 # strip off p4/ prefix
649 branch = line[len("p4/"):]
Simon Hausmann062410b2007-07-18 08:56:31[diff] [blame]650
651 branches[branch] = parseRevision(line)
Pete Wyckoff2c8037e2013-01-15 00:46:57[diff] [blame]652
Simon Hausmann062410b2007-07-18 08:56:31[diff] [blame]653 return branches
654
Pete Wyckoff5a8e84c2013-01-15 00:47:05[diff] [blame]655def 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-21 22:01:57[diff] [blame]666def findUpstreamBranchPoint(head = "HEAD"):
Simon Hausmann86506fe2007-07-18 10:40:12[diff] [blame]667 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 12:31:59[diff] [blame]678 settings = None
Simon Hausmann27d2d812007-06-12 12:31:59[diff] [blame]679 parent = 0
680 while parent < 65535:
Simon Hausmann9ceab362007-06-21 22:01:57[diff] [blame]681 commit = head + "~%s" % parent
Simon Hausmann27d2d812007-06-12 12:31:59[diff] [blame]682 log = extractLogMessageFromGitCommit(commit)
683 settings = extractSettingsGitLog(log)
Simon Hausmann86506fe2007-07-18 10:40:12[diff] [blame]684 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 12:31:59[diff] [blame]688
Simon Hausmann86506fe2007-07-18 10:40:12[diff] [blame]689 parent = parent + 1
Simon Hausmann27d2d812007-06-12 12:31:59[diff] [blame]690
Simon Hausmann86506fe2007-07-18 10:40:12[diff] [blame]691 return ["", settings]
Simon Hausmann27d2d812007-06-12 12:31:59[diff] [blame]692
Simon Hausmann5ca44612007-08-24 15:44:16[diff] [blame]693def 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 13:56:36[diff] [blame]743def p4ChangesForPaths(depotPaths, changeRange):
744 assert depotPaths
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]745 cmd = ['changes']
746 for p in depotPaths:
747 cmd += ["%s...%s" % (p, changeRange)]
748 output = p4_read_pipe_lines(cmd)
Simon Hausmann4f6432d2007-08-26 13:56:36[diff] [blame]749
Pete Wyckoffb4b0ba02009-02-18 18:12:14[diff] [blame]750 changes = {}
Simon Hausmann4f6432d2007-08-26 13:56:36[diff] [blame]751 for line in output:
Andrew Garberc3f61632011-04-07 06:01:21[diff] [blame]752 changeNum = int(line.split(" ")[1])
753 changes[changeNum] = True
Simon Hausmann4f6432d2007-08-26 13:56:36[diff] [blame]754
Pete Wyckoffb4b0ba02009-02-18 18:12:14[diff] [blame]755 changelist = changes.keys()
756 changelist.sort()
757 return changelist
Simon Hausmann4f6432d2007-08-26 13:56:36[diff] [blame]758
Tor Arvid Lundd53de8b2011-03-15 12:08:02[diff] [blame]759def 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-27 03:11:24[diff] [blame]767 if gitConfigBool("core.ignorecase"):
Tor Arvid Lundd53de8b2011-03-15 12:08:02[diff] [blame]768 return path.lower().startswith(prefix.lower())
769 return path.startswith(prefix)
770
Pete Wyckoff543987b2012-02-26 01:06:25[diff] [blame]771def 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 10:02:06[diff] [blame]783 # the //client/ name
784 client_name = entry["Client"]
785
Pete Wyckoff543987b2012-02-26 01:06:25[diff] [blame]786 # 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 10:02:06[diff] [blame]790 view = View(client_name)
Pete Wyckoff543987b2012-02-26 01:06:25[diff] [blame]791
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-30 00:57:17[diff] [blame]814#
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 19:14:32[diff] [blame]840 m = re.search("[*#@%]", path)
841 return m is not None
Pete Wyckoff9d7d4462012-04-30 00:57:17[diff] [blame]842
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]843class Command:
844 def __init__(self):
845 self.usage = "usage: %prog [options]"
Simon Hausmann8910ac02007-03-26 06:18:55[diff] [blame]846 self.needsGit = True
Luke Diamand6a10b6a2012-04-24 08:33:23[diff] [blame]847 self.verbose = False
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]848
Luke Diamand3ea2cfd2011-04-21 19:50:23[diff] [blame]849class P4UserMap:
850 def __init__(self):
851 self.userMapFromPerforceServer = False
Luke Diamandaffb4742012-01-19 09:52:27[diff] [blame]852 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 19:50:23[diff] [blame]872
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 19:54:23[diff] [blame]910class P4Debug(Command):
Simon Hausmann86949ee2007-03-19 19:59:12[diff] [blame]911 def __init__(self):
Simon Hausmann6ae8de82007-03-22 20:10:25[diff] [blame]912 Command.__init__(self)
Luke Diamand6a10b6a2012-04-24 08:33:23[diff] [blame]913 self.options = []
Simon Hausmannc8c39112007-03-19 20:02:30[diff] [blame]914 self.description = "A tool to debug the output of p4 -G."
Simon Hausmann8910ac02007-03-26 06:18:55[diff] [blame]915 self.needsGit = False
Simon Hausmann86949ee2007-03-19 19:59:12[diff] [blame]916
917 def run(self, args):
Han-Wen Nienhuysb1ce9442007-05-23 21:49:35[diff] [blame]918 j = 0
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]919 for output in p4CmdList(args):
Han-Wen Nienhuysb1ce9442007-05-23 21:49:35[diff] [blame]920 print 'Element: %d' % j
921 j += 1
Simon Hausmann86949ee2007-03-19 19:59:12[diff] [blame]922 print output
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]923 return True
Simon Hausmann86949ee2007-03-19 19:59:12[diff] [blame]924
Simon Hausmann58346842007-05-21 20:57:06[diff] [blame]925class P4RollBack(Command):
926 def __init__(self):
927 Command.__init__(self)
928 self.options = [
Simon Hausmann0c66a782007-05-23 18:07:57[diff] [blame]929 optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true")
Simon Hausmann58346842007-05-21 20:57:06[diff] [blame]930 ]
931 self.description = "A tool to debug the multi-branch import. Don't use :)"
Simon Hausmann0c66a782007-05-23 18:07:57[diff] [blame]932 self.rollbackLocalBranches = False
Simon Hausmann58346842007-05-21 20:57:06[diff] [blame]933
934 def run(self, args):
935 if len(args) != 1:
936 return False
937 maxChange = int(args[0])
Simon Hausmann0c66a782007-05-23 18:07:57[diff] [blame]938
Simon Hausmannad192f22007-05-23 21:44:19[diff] [blame]939 if "p4ExitCode" in p4Cmd("changes -m 1"):
Simon Hausmann66a2f522007-05-23 21:40:48[diff] [blame]940 die("Problems executing p4");
941
Simon Hausmann0c66a782007-05-23 18:07:57[diff] [blame]942 if self.rollbackLocalBranches:
943 refPrefix = "refs/heads/"
Han-Wen Nienhuysb016d392007-05-23 20:10:46[diff] [blame]944 lines = read_pipe_lines("git rev-parse --symbolic --branches")
Simon Hausmann0c66a782007-05-23 18:07:57[diff] [blame]945 else:
946 refPrefix = "refs/remotes/"
Han-Wen Nienhuysb016d392007-05-23 20:10:46[diff] [blame]947 lines = read_pipe_lines("git rev-parse --symbolic --remotes")
Simon Hausmann0c66a782007-05-23 18:07:57[diff] [blame]948
949 for line in lines:
950 if self.rollbackLocalBranches or (line.startswith("p4/") and line != "p4/HEAD\n"):
Han-Wen Nienhuysb25b2062007-05-23 21:49:35[diff] [blame]951 line = line.strip()
952 ref = refPrefix + line
Simon Hausmann58346842007-05-21 20:57:06[diff] [blame]953 log = extractLogMessageFromGitCommit(ref)
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]954 settings = extractSettingsGitLog(log)
955
956 depotPaths = settings['depot-paths']
957 change = settings['change']
958
Simon Hausmann58346842007-05-21 20:57:06[diff] [blame]959 changed = False
Simon Hausmann52102d42007-05-21 21:44:24[diff] [blame]960
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]961 if len(p4Cmd("changes -m 1 " + ' '.join (['%s...@%s' % (p, maxChange)
962 for p in depotPaths]))) == 0:
Simon Hausmann52102d42007-05-21 21:44:24[diff] [blame]963 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 21:49:35[diff] [blame]967 while change and int(change) > maxChange:
Simon Hausmann58346842007-05-21 20:57:06[diff] [blame]968 changed = True
Simon Hausmann52102d42007-05-21 21:44:24[diff] [blame]969 if self.verbose:
970 print "%s is at %s ; rewinding towards %s" % (ref, change, maxChange)
Simon Hausmann58346842007-05-21 20:57:06[diff] [blame]971 system("git update-ref %s \"%s^\"" % (ref, ref))
972 log = extractLogMessageFromGitCommit(ref)
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]973 settings = extractSettingsGitLog(log)
974
975
976 depotPaths = settings['depot-paths']
977 change = settings['change']
Simon Hausmann58346842007-05-21 20:57:06[diff] [blame]978
979 if changed:
Simon Hausmann52102d42007-05-21 21:44:24[diff] [blame]980 print "%s rewound to %s" % (ref, change)
Simon Hausmann58346842007-05-21 20:57:06[diff] [blame]981
982 return True
983
Luke Diamand3ea2cfd2011-04-21 19:50:23[diff] [blame]984class P4Submit(Command, P4UserMap):
Pete Wyckoff6bbfd132012-09-09 20:16:13[diff] [blame]985
986 conflict_behavior_choices = ("ask", "skip", "quit")
987
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]988 def __init__(self):
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]989 Command.__init__(self)
Luke Diamand3ea2cfd2011-04-21 19:50:23[diff] [blame]990 P4UserMap.__init__(self)
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]991 self.options = [
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]992 optparse.make_option("--origin", dest="origin"),
Vitor Antunesae901092011-02-20 01:18:24[diff] [blame]993 optparse.make_option("-M", dest="detectRenames", action="store_true"),
Luke Diamand3ea2cfd2011-04-21 19:50:23[diff] [blame]994 # preserve the user, requires relevant p4 permissions
995 optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"),
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]996 optparse.make_option("--export-labels", dest="exportLabels", action="store_true"),
Pete Wyckoffef739f02012-09-09 20:16:11[diff] [blame]997 optparse.make_option("--dry-run", "-n", dest="dry_run", action="store_true"),
Pete Wyckoff728b7ad2012-09-09 20:16:12[diff] [blame]998 optparse.make_option("--prepare-p4-only", dest="prepare_p4_only", action="store_true"),
Pete Wyckoff6bbfd132012-09-09 20:16:13[diff] [blame]999 optparse.make_option("--conflict", dest="conflict_behavior",
Pete Wyckoff44e8d262013-01-15 00:47:08[diff] [blame]1000 choices=self.conflict_behavior_choices),
1001 optparse.make_option("--branch", dest="branch"),
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1002 ]
1003 self.description = "Submit changes from git to the perforce depot."
Simon Hausmannc9b50e62007-03-29 17:15:24[diff] [blame]1004 self.usage += " [name of git branch to submit into perforce depot]"
Simon Hausmann95124972007-03-23 08:16:07[diff] [blame]1005 self.origin = ""
Vitor Antunesae901092011-02-20 01:18:24[diff] [blame]1006 self.detectRenames = False
Pete Wyckoff0d609032013-01-27 03:11:24[diff] [blame]1007 self.preserveUser = gitConfigBool("git-p4.preserveUser")
Pete Wyckoffef739f02012-09-09 20:16:11[diff] [blame]1008 self.dry_run = False
Pete Wyckoff728b7ad2012-09-09 20:16:12[diff] [blame]1009 self.prepare_p4_only = False
Pete Wyckoff6bbfd132012-09-09 20:16:13[diff] [blame]1010 self.conflict_behavior = None
Marius Storm-Olsenf7baba82007-06-07 12:07:01[diff] [blame]1011 self.isWindows = (platform.system() == "Windows")
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]1012 self.exportLabels = False
Pete Wyckoff249da4c2012-11-23 22:35:35[diff] [blame]1013 self.p4HasMoveCommand = p4_has_move_command()
Pete Wyckoff44e8d262013-01-15 00:47:08[diff] [blame]1014 self.branch = None
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1015
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1016 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 13:34:20[diff] [blame]1020 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 21:25:17[diff] [blame]1048 result = ""
1049
Simon Hausmannedae1e22008-02-19 08:29:06[diff] [blame]1050 inDescriptionSection = False
1051
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1052 for line in template.split("\n"):
1053 if line.startswith("#"):
1054 result += line + "\n"
1055 continue
1056
Simon Hausmannedae1e22008-02-19 08:29:06[diff] [blame]1057 if inDescriptionSection:
Michael Horowitzc9dbab02011-02-26 02:31:13[diff] [blame]1058 if line.startswith("Files:") or line.startswith("Jobs:"):
Simon Hausmannedae1e22008-02-19 08:29:06[diff] [blame]1059 inDescriptionSection = False
Pete Wyckofff19cb0a2012-07-04 13:34:20[diff] [blame]1060 # insert Jobs section
1061 if jobs:
1062 result += jobs + "\n"
Simon Hausmannedae1e22008-02-19 08:29:06[diff] [blame]1063 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 21:25:17[diff] [blame]1071
Simon Hausmannedae1e22008-02-19 08:29:06[diff] [blame]1072 result += line + "\n"
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1073
1074 return result
1075
Luke Diamand60df0712012-02-23 07:51:30[diff] [blame]1076 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 19:50:23[diff] [blame]1099 def p4UserForCommit(self,id):
1100 # Return the tuple (perforce user,git email) for a given git commit id
1101 self.getUserMapFromPerforceServer()
Pete Wyckoff9bf28852013-01-27 03:11:20[diff] [blame]1102 gitEmail = read_pipe(["git", "log", "--max-count=1",
1103 "--format=%ae", id])
Luke Diamand3ea2cfd2011-04-21 19:50:23[diff] [blame]1104 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-27 03:11:24[diff] [blame]1116 if gitConfigBool("git-p4.allowMissingP4Users"):
Luke Diamand3ea2cfd2011-04-21 19:50:23[diff] [blame]1117 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 14:47:52[diff] [blame]1134 results = p4CmdList(["changes", "-c", client, "-m", "1"])
Luke Diamand3ea2cfd2011-04-21 19:50:23[diff] [blame]1135 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 10:19:43[diff] [blame]1143 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 19:50:23[diff] [blame]1152 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[diff] [blame]1165 results = p4CmdList(["protects", self.depotPath])
Luke Diamand3ea2cfd2011-04-21 19:50:23[diff] [blame]1166 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 15:06:55[diff] [blame]1174 def prepareSubmitTemplate(self):
Pete Wyckofff19cb0a2012-07-04 13:34:20[diff] [blame]1175 """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 15:06:55[diff] [blame]1182 template = ""
1183 inFilesSection = False
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]1184 for line in p4_read_pipe_lines(['change', '-o']):
Marius Storm-Olsenf3e5ae42008-03-28 14:40:40[diff] [blame]1185 if line.endswith("\r\n"):
1186 line = line[:-2] + "\n"
Simon Hausmannea99c3a2007-08-08 15:06:55[diff] [blame]1187 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 12:08:02[diff] [blame]1194 if not p4PathStartsWith(path, self.depotPath):
Simon Hausmannea99c3a2007-08-08 15:06:55[diff] [blame]1195 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-05 00:22:45[diff] [blame]1206 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-27 03:11:24[diff] [blame]1211 if gitConfigBool("git-p4.skipSubmitEdit"):
Pete Wyckoff7c766e52011-12-05 00:22:45[diff] [blame]1212 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 08:33:21[diff] [blame]1219 if os.environ.has_key("P4EDITOR") and (os.environ.get("P4EDITOR") != ""):
Pete Wyckoff7c766e52011-12-05 00:22:45[diff] [blame]1220 editor = os.environ.get("P4EDITOR")
1221 else:
1222 editor = read_pipe("git var GIT_EDITOR").strip()
Pete Wyckoff0cf1b722014-01-21 23:16:44[diff] [blame]1223 system([editor, template_file])
Pete Wyckoff7c766e52011-12-05 00:22:45[diff] [blame]1224
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-27 03:11:24[diff] [blame]1227 if gitConfigBool("git-p4.skipSubmitEditCheck"):
Pete Wyckoff7c766e52011-12-05 00:22:45[diff] [blame]1228 return True
1229
Pete Wyckoffd1652042011-12-17 17:39:03[diff] [blame]1230 # 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-05 00:22:45[diff] [blame]1240
Maxime Costee2a892e2014-06-11 13:09:59[diff] [blame]1241 def get_diff_description(self, editedFiles, filesToAdd):
Maxime Costeb4073bb2014-05-24 17:40:35[diff] [blame]1242 # diff
1243 if os.environ.has_key("P4DIFF"):
1244 del(os.environ["P4DIFF"])
1245 diff = ""
1246 for editedFile in editedFiles:
1247 diff += p4_read_pipe(['diff', '-du',
1248 wildcard_encode(editedFile)])
1249
1250 # new file diff
1251 newdiff = ""
1252 for newFile in filesToAdd:
1253 newdiff += "==== new file ====\n"
1254 newdiff += "--- /dev/null\n"
1255 newdiff += "+++ %s\n" % newFile
1256 f = open(newFile, "r")
1257 for line in f.readlines():
1258 newdiff += "+" + line
1259 f.close()
1260
Maxime Costee2a892e2014-06-11 13:09:59[diff] [blame]1261 return (diff + newdiff).replace('\r\n', '\n')
Maxime Costeb4073bb2014-05-24 17:40:35[diff] [blame]1262
Han-Wen Nienhuys7cb5cbe2007-05-23 19:55:48[diff] [blame]1263 def applyCommit(self, id):
Pete Wyckoff67b0fe22012-09-09 20:16:03[diff] [blame]1264 """Apply one commit, return True if it succeeded."""
1265
1266 print "Applying", read_pipe(["git", "show", "-s",
1267 "--format=format:%h %s", id])
Vitor Antunesae901092011-02-20 01:18:24[diff] [blame]1268
Luke Diamand848de9c2011-05-13 19:46:00[diff] [blame]1269 (p4User, gitEmail) = self.p4UserForCommit(id)
Luke Diamand3ea2cfd2011-04-21 19:50:23[diff] [blame]1270
Gary Gibbons84cb0002012-07-04 13:40:19[diff] [blame]1271 diff = read_pipe_lines("git diff-tree -r %s \"%s^\" \"%s\"" % (self.diffOpts, id, id))
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1272 filesToAdd = set()
1273 filesToDelete = set()
Simon Hausmannd336c152007-05-16 07:41:26[diff] [blame]1274 editedFiles = set()
Pete Wyckoffb6ad6dc2012-04-30 00:57:16[diff] [blame]1275 pureRenameCopy = set()
Chris Pettittc65b6702007-11-02 03:43:14[diff] [blame]1276 filesToChangeExecBit = {}
Luke Diamand60df0712012-02-23 07:51:30[diff] [blame]1277
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1278 for line in diff:
Chris Pettittb43b0a32007-11-02 03:43:13[diff] [blame]1279 diff = parseDiffTreeEntry(line)
1280 modifier = diff['status']
1281 path = diff['src']
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1282 if modifier == "M":
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]1283 p4_edit(path)
Chris Pettittc65b6702007-11-02 03:43:14[diff] [blame]1284 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
1285 filesToChangeExecBit[path] = diff['dst_mode']
Simon Hausmannd336c152007-05-16 07:41:26[diff] [blame]1286 editedFiles.add(path)
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1287 elif modifier == "A":
1288 filesToAdd.add(path)
Chris Pettittc65b6702007-11-02 03:43:14[diff] [blame]1289 filesToChangeExecBit[path] = diff['dst_mode']
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1290 if path in filesToDelete:
1291 filesToDelete.remove(path)
1292 elif modifier == "D":
1293 filesToDelete.add(path)
1294 if path in filesToAdd:
1295 filesToAdd.remove(path)
Vitor Antunes4fddb412011-02-20 01:18:25[diff] [blame]1296 elif modifier == "C":
1297 src, dest = diff['src'], diff['dst']
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]1298 p4_integrate(src, dest)
Pete Wyckoffb6ad6dc2012-04-30 00:57:16[diff] [blame]1299 pureRenameCopy.add(dest)
Vitor Antunes4fddb412011-02-20 01:18:25[diff] [blame]1300 if diff['src_sha1'] != diff['dst_sha1']:
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]1301 p4_edit(dest)
Pete Wyckoffb6ad6dc2012-04-30 00:57:16[diff] [blame]1302 pureRenameCopy.discard(dest)
Vitor Antunes4fddb412011-02-20 01:18:25[diff] [blame]1303 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]1304 p4_edit(dest)
Pete Wyckoffb6ad6dc2012-04-30 00:57:16[diff] [blame]1305 pureRenameCopy.discard(dest)
Vitor Antunes4fddb412011-02-20 01:18:25[diff] [blame]1306 filesToChangeExecBit[dest] = diff['dst_mode']
Pete Wyckoffd20f0f82013-01-27 03:11:19[diff] [blame]1307 if self.isWindows:
1308 # turn off read-only attribute
1309 os.chmod(dest, stat.S_IWRITE)
Vitor Antunes4fddb412011-02-20 01:18:25[diff] [blame]1310 os.unlink(dest)
1311 editedFiles.add(dest)
Chris Pettittd9a5f252007-10-16 05:15:06[diff] [blame]1312 elif modifier == "R":
Chris Pettittb43b0a32007-11-02 03:43:13[diff] [blame]1313 src, dest = diff['src'], diff['dst']
Gary Gibbons8e9497c2012-07-12 23:29:00[diff] [blame]1314 if self.p4HasMoveCommand:
1315 p4_edit(src) # src must be open before move
1316 p4_move(src, dest) # opens for (move/delete, move/add)
Pete Wyckoffb6ad6dc2012-04-30 00:57:16[diff] [blame]1317 else:
Gary Gibbons8e9497c2012-07-12 23:29:00[diff] [blame]1318 p4_integrate(src, dest)
1319 if diff['src_sha1'] != diff['dst_sha1']:
1320 p4_edit(dest)
1321 else:
1322 pureRenameCopy.add(dest)
Chris Pettittc65b6702007-11-02 03:43:14[diff] [blame]1323 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
Gary Gibbons8e9497c2012-07-12 23:29:00[diff] [blame]1324 if not self.p4HasMoveCommand:
1325 p4_edit(dest) # with move: already open, writable
Chris Pettittc65b6702007-11-02 03:43:14[diff] [blame]1326 filesToChangeExecBit[dest] = diff['dst_mode']
Gary Gibbons8e9497c2012-07-12 23:29:00[diff] [blame]1327 if not self.p4HasMoveCommand:
Pete Wyckoffd20f0f82013-01-27 03:11:19[diff] [blame]1328 if self.isWindows:
1329 os.chmod(dest, stat.S_IWRITE)
Gary Gibbons8e9497c2012-07-12 23:29:00[diff] [blame]1330 os.unlink(dest)
1331 filesToDelete.add(src)
Chris Pettittd9a5f252007-10-16 05:15:06[diff] [blame]1332 editedFiles.add(dest)
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1333 else:
1334 die("unknown modifier %s for %s" % (modifier, path))
1335
Tolga Ceylan749b6682014-05-07 05:48:54[diff] [blame]1336 diffcmd = "git diff-tree --full-index -p \"%s\"" % (id)
Simon Hausmann47a130b2007-05-20 14:33:21[diff] [blame]1337 patchcmd = diffcmd + " | git apply "
Simon Hausmannc1b296b2007-05-20 14:55:05[diff] [blame]1338 tryPatchCmd = patchcmd + "--check -"
1339 applyPatchCmd = patchcmd + "--check --apply -"
Luke Diamand60df0712012-02-23 07:51:30[diff] [blame]1340 patch_succeeded = True
Simon Hausmann51a26402007-04-15 07:59:56[diff] [blame]1341
Simon Hausmann47a130b2007-05-20 14:33:21[diff] [blame]1342 if os.system(tryPatchCmd) != 0:
Luke Diamand60df0712012-02-23 07:51:30[diff] [blame]1343 fixed_rcs_keywords = False
1344 patch_succeeded = False
Simon Hausmann51a26402007-04-15 07:59:56[diff] [blame]1345 print "Unfortunately applying the change failed!"
Luke Diamand60df0712012-02-23 07:51:30[diff] [blame]1346
1347 # Patch failed, maybe it's just RCS keyword woes. Look through
1348 # the patch to see if that's possible.
Pete Wyckoff0d609032013-01-27 03:11:24[diff] [blame]1349 if gitConfigBool("git-p4.attemptRCSCleanup"):
Luke Diamand60df0712012-02-23 07:51:30[diff] [blame]1350 file = None
1351 pattern = None
1352 kwfiles = {}
1353 for file in editedFiles | filesToDelete:
1354 # did this file's delta contain RCS keywords?
1355 pattern = p4_keywords_regexp_for_file(file)
1356
1357 if pattern:
1358 # this file is a possibility...look for RCS keywords.
1359 regexp = re.compile(pattern, re.VERBOSE)
1360 for line in read_pipe_lines(["git", "diff", "%s^..%s" % (id, id), file]):
1361 if regexp.search(line):
1362 if verbose:
1363 print "got keyword match on %s in %s in %s" % (pattern, line, file)
1364 kwfiles[file] = pattern
1365 break
1366
1367 for file in kwfiles:
1368 if verbose:
1369 print "zapping %s with %s" % (line,pattern)
Pete Wyckoffd20f0f82013-01-27 03:11:19[diff] [blame]1370 # File is being deleted, so not open in p4. Must
1371 # disable the read-only bit on windows.
1372 if self.isWindows and file not in editedFiles:
1373 os.chmod(file, stat.S_IWRITE)
Luke Diamand60df0712012-02-23 07:51:30[diff] [blame]1374 self.patchRCSKeywords(file, kwfiles[file])
1375 fixed_rcs_keywords = True
1376
1377 if fixed_rcs_keywords:
1378 print "Retrying the patch with RCS keywords cleaned up"
1379 if os.system(tryPatchCmd) == 0:
1380 patch_succeeded = True
1381
1382 if not patch_succeeded:
Pete Wyckoff7e5dd9f2012-09-09 20:16:05[diff] [blame]1383 for f in editedFiles:
1384 p4_revert(f)
Pete Wyckoff7e5dd9f2012-09-09 20:16:05[diff] [blame]1385 return False
Simon Hausmann51a26402007-04-15 07:59:56[diff] [blame]1386
Pete Wyckoff55ac2ed2012-09-09 20:16:08[diff] [blame]1387 #
1388 # Apply the patch for real, and do add/delete/+x handling.
1389 #
Simon Hausmann47a130b2007-05-20 14:33:21[diff] [blame]1390 system(applyPatchCmd)
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1391
1392 for f in filesToAdd:
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]1393 p4_add(f)
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1394 for f in filesToDelete:
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]1395 p4_revert(f)
1396 p4_delete(f)
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1397
Chris Pettittc65b6702007-11-02 03:43:14[diff] [blame]1398 # Set/clear executable bits
1399 for f in filesToChangeExecBit.keys():
1400 mode = filesToChangeExecBit[f]
1401 setP4ExecBit(f, mode)
1402
Pete Wyckoff55ac2ed2012-09-09 20:16:08[diff] [blame]1403 #
1404 # Build p4 change description, starting with the contents
1405 # of the git commit message.
1406 #
Simon Hausmann0e36f2d2008-02-19 08:33:08[diff] [blame]1407 logMessage = extractLogMessageFromGitCommit(id)
Simon Hausmann0e36f2d2008-02-19 08:33:08[diff] [blame]1408 logMessage = logMessage.strip()
Pete Wyckofff19cb0a2012-07-04 13:34:20[diff] [blame]1409 (logMessage, jobs) = self.separate_jobs_from_description(logMessage)
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1410
Simon Hausmannea99c3a2007-08-08 15:06:55[diff] [blame]1411 template = self.prepareSubmitTemplate()
Pete Wyckofff19cb0a2012-07-04 13:34:20[diff] [blame]1412 submitTemplate = self.prepareLogMessage(template, logMessage, jobs)
Pete Wyckoffc47178d2012-07-04 13:34:18[diff] [blame]1413
1414 if self.preserveUser:
Pete Wyckoff55ac2ed2012-09-09 20:16:08[diff] [blame]1415 submitTemplate += "\n######## Actual user %s, modified after commit\n" % p4User
Pete Wyckoffc47178d2012-07-04 13:34:18[diff] [blame]1416
Pete Wyckoff55ac2ed2012-09-09 20:16:08[diff] [blame]1417 if self.checkAuthorship and not self.p4UserIsMe(p4User):
1418 submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail
1419 submitTemplate += "######## Use option --preserve-user to modify authorship.\n"
1420 submitTemplate += "######## Variable git-p4.skipUserNameCheck hides this message.\n"
1421
1422 separatorLine = "######## everything below this line is just the diff #######\n"
Maxime Costeb4073bb2014-05-24 17:40:35[diff] [blame]1423 if not self.prepare_p4_only:
1424 submitTemplate += separatorLine
Maxime Costee2a892e2014-06-11 13:09:59[diff] [blame]1425 submitTemplate += self.get_diff_description(editedFiles, filesToAdd)
Pete Wyckoff55ac2ed2012-09-09 20:16:08[diff] [blame]1426
Pete Wyckoffc47178d2012-07-04 13:34:18[diff] [blame]1427 (handle, fileName) = tempfile.mkstemp()
Maxime Costee2a892e2014-06-11 13:09:59[diff] [blame]1428 tmpFile = os.fdopen(handle, "w+b")
Pete Wyckoffc47178d2012-07-04 13:34:18[diff] [blame]1429 if self.isWindows:
1430 submitTemplate = submitTemplate.replace("\n", "\r\n")
Maxime Costeb4073bb2014-05-24 17:40:35[diff] [blame]1431 tmpFile.write(submitTemplate)
Pete Wyckoffc47178d2012-07-04 13:34:18[diff] [blame]1432 tmpFile.close()
1433
Pete Wyckoff728b7ad2012-09-09 20:16:12[diff] [blame]1434 if self.prepare_p4_only:
1435 #
1436 # Leave the p4 tree prepared, and the submit template around
1437 # and let the user decide what to do next
1438 #
1439 print
1440 print "P4 workspace prepared for submission."
1441 print "To submit or revert, go to client workspace"
1442 print " " + self.clientPath
1443 print
1444 print "To submit, use \"p4 submit\" to write a new description,"
Luke Diamand10de86d2015-01-23 09:15:12[diff] [blame]1445 print "or \"p4 submit -i <%s\" to use the one prepared by" \
Pete Wyckoff728b7ad2012-09-09 20:16:12[diff] [blame]1446 " \"git p4\"." % fileName
1447 print "You can delete the file \"%s\" when finished." % fileName
1448
1449 if self.preserveUser and p4User and not self.p4UserIsMe(p4User):
1450 print "To preserve change ownership by user %s, you must\n" \
1451 "do \"p4 change -f <change>\" after submitting and\n" \
1452 "edit the User field."
1453 if pureRenameCopy:
1454 print "After submitting, renamed files must be re-synced."
1455 print "Invoke \"p4 sync -f\" on each of these files:"
1456 for f in pureRenameCopy:
1457 print " " + f
1458
1459 print
1460 print "To revert the changes, use \"p4 revert ...\", and delete"
1461 print "the submit template file \"%s\"" % fileName
1462 if filesToAdd:
1463 print "Since the commit adds new files, they must be deleted:"
1464 for f in filesToAdd:
1465 print " " + f
1466 print
1467 return True
1468
Pete Wyckoff55ac2ed2012-09-09 20:16:08[diff] [blame]1469 #
1470 # Let the user edit the change description, then submit it.
1471 #
Pete Wyckoffc47178d2012-07-04 13:34:18[diff] [blame]1472 if self.edit_template(fileName):
1473 # read the edited message and submit
Pete Wyckoff5a41c162012-09-09 20:16:06[diff] [blame]1474 ret = True
Pete Wyckoffc47178d2012-07-04 13:34:18[diff] [blame]1475 tmpFile = open(fileName, "rb")
1476 message = tmpFile.read()
1477 tmpFile.close()
Pete Wyckoffc47178d2012-07-04 13:34:18[diff] [blame]1478 if self.isWindows:
Maxime Costee2a892e2014-06-11 13:09:59[diff] [blame]1479 message = message.replace("\r\n", "\n")
1480 submitTemplate = message[:message.index(separatorLine)]
Pete Wyckoffc47178d2012-07-04 13:34:18[diff] [blame]1481 p4_write_pipe(['submit', '-i'], submitTemplate)
Luke Diamandecdba362011-05-07 10:19:43[diff] [blame]1482
1483 if self.preserveUser:
Pete Wyckoffc47178d2012-07-04 13:34:18[diff] [blame]1484 if p4User:
1485 # Get last changelist number. Cannot easily get it from
1486 # the submit command output as the output is
1487 # unmarshalled.
1488 changelist = self.lastP4Changelist()
1489 self.modifyChangelistUser(changelist, p4User)
Luke Diamandecdba362011-05-07 10:19:43[diff] [blame]1490
Pete Wyckoffc47178d2012-07-04 13:34:18[diff] [blame]1491 # The rename/copy happened by applying a patch that created a
1492 # new file. This leaves it writable, which confuses p4.
1493 for f in pureRenameCopy:
1494 p4_sync(f, "-f")
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1495
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1496 else:
Pete Wyckoffc47178d2012-07-04 13:34:18[diff] [blame]1497 # skip this patch
Pete Wyckoff5a41c162012-09-09 20:16:06[diff] [blame]1498 ret = False
Pete Wyckoffc47178d2012-07-04 13:34:18[diff] [blame]1499 print "Submission cancelled, undoing p4 changes."
1500 for f in editedFiles:
1501 p4_revert(f)
1502 for f in filesToAdd:
1503 p4_revert(f)
1504 os.remove(f)
Pete Wyckoffdf9c5452012-09-09 20:16:09[diff] [blame]1505 for f in filesToDelete:
1506 p4_revert(f)
Pete Wyckoffc47178d2012-07-04 13:34:18[diff] [blame]1507
1508 os.remove(fileName)
Pete Wyckoff5a41c162012-09-09 20:16:06[diff] [blame]1509 return ret
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1510
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]1511 # Export git tags as p4 labels. Create a p4 label and then tag
1512 # with that.
1513 def exportGitTags(self, gitTags):
Luke Diamandc8942a22012-04-11 15:21:24[diff] [blame]1514 validLabelRegexp = gitConfig("git-p4.labelExportRegexp")
1515 if len(validLabelRegexp) == 0:
1516 validLabelRegexp = defaultLabelRegexp
1517 m = re.compile(validLabelRegexp)
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]1518
1519 for name in gitTags:
1520
1521 if not m.match(name):
1522 if verbose:
Luke Diamand05a3cec2012-05-11 06:25:17[diff] [blame]1523 print "tag %s does not match regexp %s" % (name, validLabelRegexp)
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]1524 continue
1525
1526 # Get the p4 commit this corresponds to
Luke Diamandc8942a22012-04-11 15:21:24[diff] [blame]1527 logMessage = extractLogMessageFromGitCommit(name)
1528 values = extractSettingsGitLog(logMessage)
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]1529
Luke Diamandc8942a22012-04-11 15:21:24[diff] [blame]1530 if not values.has_key('change'):
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]1531 # a tag pointing to something not sent to p4; ignore
1532 if verbose:
1533 print "git tag %s does not give a p4 commit" % name
1534 continue
Luke Diamandc8942a22012-04-11 15:21:24[diff] [blame]1535 else:
1536 changelist = values['change']
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]1537
1538 # Get the tag details.
1539 inHeader = True
1540 isAnnotated = False
1541 body = []
1542 for l in read_pipe_lines(["git", "cat-file", "-p", name]):
1543 l = l.strip()
1544 if inHeader:
1545 if re.match(r'tag\s+', l):
1546 isAnnotated = True
1547 elif re.match(r'\s*$', l):
1548 inHeader = False
1549 continue
1550 else:
1551 body.append(l)
1552
1553 if not isAnnotated:
1554 body = ["lightweight tag imported by git p4\n"]
1555
1556 # Create the label - use the same view as the client spec we are using
1557 clientSpec = getClientSpec()
1558
1559 labelTemplate = "Label: %s\n" % name
1560 labelTemplate += "Description:\n"
1561 for b in body:
1562 labelTemplate += "\t" + b + "\n"
1563 labelTemplate += "View:\n"
Kazuki Saitoh9d57c4a2013-08-30 10:02:06[diff] [blame]1564 for depot_side in clientSpec.mappings:
1565 labelTemplate += "\t%s\n" % depot_side
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]1566
Pete Wyckoffef739f02012-09-09 20:16:11[diff] [blame]1567 if self.dry_run:
1568 print "Would create p4 label %s for tag" % name
Pete Wyckoff728b7ad2012-09-09 20:16:12[diff] [blame]1569 elif self.prepare_p4_only:
1570 print "Not creating p4 label %s for tag due to option" \
1571 " --prepare-p4-only" % name
Pete Wyckoffef739f02012-09-09 20:16:11[diff] [blame]1572 else:
1573 p4_write_pipe(["label", "-i"], labelTemplate)
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]1574
Pete Wyckoffef739f02012-09-09 20:16:11[diff] [blame]1575 # Use the label
1576 p4_system(["tag", "-l", name] +
Kazuki Saitoh9d57c4a2013-08-30 10:02:06[diff] [blame]1577 ["%s@%s" % (depot_side, changelist) for depot_side in clientSpec.mappings])
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]1578
Pete Wyckoffef739f02012-09-09 20:16:11[diff] [blame]1579 if verbose:
1580 print "created p4 label for tag %s" % name
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]1581
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1582 def run(self, args):
Simon Hausmannc9b50e62007-03-29 17:15:24[diff] [blame]1583 if len(args) == 0:
1584 self.master = currentGitBranch()
Simon Hausmann4280e532007-05-25 06:49:18[diff] [blame]1585 if len(self.master) == 0 or not gitBranchExists("refs/heads/%s" % self.master):
Simon Hausmannc9b50e62007-03-29 17:15:24[diff] [blame]1586 die("Detecting current git branch failed!")
1587 elif len(args) == 1:
1588 self.master = args[0]
Pete Wyckoff28755db2011-12-25 02:07:40[diff] [blame]1589 if not branchExists(self.master):
1590 die("Branch %s does not exist" % self.master)
Simon Hausmannc9b50e62007-03-29 17:15:24[diff] [blame]1591 else:
1592 return False
1593
Jing Xue4c2d5d72008-06-22 18:12:39[diff] [blame]1594 allowSubmit = gitConfig("git-p4.allowSubmit")
1595 if len(allowSubmit) > 0 and not self.master in allowSubmit.split(","):
1596 die("%s is not in git-p4.allowSubmit" % self.master)
1597
Simon Hausmann27d2d812007-06-12 12:31:59[diff] [blame]1598 [upstream, settings] = findUpstreamBranchPoint()
Simon Hausmannea99c3a2007-08-08 15:06:55[diff] [blame]1599 self.depotPath = settings['depot-paths'][0]
Simon Hausmann27d2d812007-06-12 12:31:59[diff] [blame]1600 if len(self.origin) == 0:
1601 self.origin = upstream
Simon Hausmanna3fdd572007-06-07 20:54:32[diff] [blame]1602
Luke Diamand3ea2cfd2011-04-21 19:50:23[diff] [blame]1603 if self.preserveUser:
1604 if not self.canChangeChangelists():
1605 die("Cannot preserve user names without p4 super-user or admin permissions")
1606
Pete Wyckoff6bbfd132012-09-09 20:16:13[diff] [blame]1607 # if not set from the command line, try the config file
1608 if self.conflict_behavior is None:
1609 val = gitConfig("git-p4.conflict")
1610 if val:
1611 if val not in self.conflict_behavior_choices:
1612 die("Invalid value '%s' for config git-p4.conflict" % val)
1613 else:
1614 val = "ask"
1615 self.conflict_behavior = val
1616
Simon Hausmanna3fdd572007-06-07 20:54:32[diff] [blame]1617 if self.verbose:
1618 print "Origin branch is " + self.origin
Simon Hausmann95124972007-03-23 08:16:07[diff] [blame]1619
Simon Hausmannea99c3a2007-08-08 15:06:55[diff] [blame]1620 if len(self.depotPath) == 0:
Simon Hausmann95124972007-03-23 08:16:07[diff] [blame]1621 print "Internal error: cannot locate perforce depot path from existing branches"
1622 sys.exit(128)
1623
Pete Wyckoff543987b2012-02-26 01:06:25[diff] [blame]1624 self.useClientSpec = False
Pete Wyckoff0d609032013-01-27 03:11:24[diff] [blame]1625 if gitConfigBool("git-p4.useclientspec"):
Pete Wyckoff543987b2012-02-26 01:06:25[diff] [blame]1626 self.useClientSpec = True
1627 if self.useClientSpec:
1628 self.clientSpecDirs = getClientSpec()
Simon Hausmann95124972007-03-23 08:16:07[diff] [blame]1629
Pete Wyckoff543987b2012-02-26 01:06:25[diff] [blame]1630 if self.useClientSpec:
1631 # all files are relative to the client spec
1632 self.clientPath = getClientRoot()
1633 else:
1634 self.clientPath = p4Where(self.depotPath)
1635
1636 if self.clientPath == "":
1637 die("Error: Cannot locate perforce checkout of %s in client view" % self.depotPath)
Simon Hausmann95124972007-03-23 08:16:07[diff] [blame]1638
Simon Hausmannea99c3a2007-08-08 15:06:55[diff] [blame]1639 print "Perforce checkout for depot path %s located at %s" % (self.depotPath, self.clientPath)
Simon Hausmann7944f142007-05-21 09:04:26[diff] [blame]1640 self.oldWorkingDirectory = os.getcwd()
Simon Hausmannc1b296b2007-05-20 14:55:05[diff] [blame]1641
Gary Gibbons0591cfa2011-12-09 23:48:14[diff] [blame]1642 # ensure the clientPath exists
Pete Wyckoff8d7ec362012-04-30 00:57:14[diff] [blame]1643 new_client_dir = False
Gary Gibbons0591cfa2011-12-09 23:48:14[diff] [blame]1644 if not os.path.exists(self.clientPath):
Pete Wyckoff8d7ec362012-04-30 00:57:14[diff] [blame]1645 new_client_dir = True
Gary Gibbons0591cfa2011-12-09 23:48:14[diff] [blame]1646 os.makedirs(self.clientPath)
1647
Miklós Fazekasbbd84862013-03-11 21:45:29[diff] [blame]1648 chdir(self.clientPath, is_client_path=True)
Pete Wyckoffef739f02012-09-09 20:16:11[diff] [blame]1649 if self.dry_run:
1650 print "Would synchronize p4 checkout in %s" % self.clientPath
Pete Wyckoff8d7ec362012-04-30 00:57:14[diff] [blame]1651 else:
Pete Wyckoffef739f02012-09-09 20:16:11[diff] [blame]1652 print "Synchronizing p4 checkout..."
1653 if new_client_dir:
1654 # old one was destroyed, and maybe nobody told p4
1655 p4_sync("...", "-f")
1656 else:
1657 p4_sync("...")
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1658 self.check()
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1659
Simon Hausmann4c750c02008-02-19 08:37:16[diff] [blame]1660 commits = []
Pete Wyckoffc7d34882013-01-27 03:11:21[diff] [blame]1661 for line in read_pipe_lines(["git", "rev-list", "--no-merges", "%s..%s" % (self.origin, self.master)]):
Simon Hausmann4c750c02008-02-19 08:37:16[diff] [blame]1662 commits.append(line.strip())
1663 commits.reverse()
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1664
Pete Wyckoff0d609032013-01-27 03:11:24[diff] [blame]1665 if self.preserveUser or gitConfigBool("git-p4.skipUserNameCheck"):
Luke Diamand848de9c2011-05-13 19:46:00[diff] [blame]1666 self.checkAuthorship = False
1667 else:
1668 self.checkAuthorship = True
1669
Luke Diamand3ea2cfd2011-04-21 19:50:23[diff] [blame]1670 if self.preserveUser:
1671 self.checkValidP4Users(commits)
1672
Gary Gibbons84cb0002012-07-04 13:40:19[diff] [blame]1673 #
1674 # Build up a set of options to be passed to diff when
1675 # submitting each commit to p4.
1676 #
1677 if self.detectRenames:
1678 # command-line -M arg
1679 self.diffOpts = "-M"
1680 else:
1681 # If not explicitly set check the config variable
1682 detectRenames = gitConfig("git-p4.detectRenames")
1683
1684 if detectRenames.lower() == "false" or detectRenames == "":
1685 self.diffOpts = ""
1686 elif detectRenames.lower() == "true":
1687 self.diffOpts = "-M"
1688 else:
1689 self.diffOpts = "-M%s" % detectRenames
1690
1691 # no command-line arg for -C or --find-copies-harder, just
1692 # config variables
1693 detectCopies = gitConfig("git-p4.detectCopies")
1694 if detectCopies.lower() == "false" or detectCopies == "":
1695 pass
1696 elif detectCopies.lower() == "true":
1697 self.diffOpts += " -C"
1698 else:
1699 self.diffOpts += " -C%s" % detectCopies
1700
Pete Wyckoff0d609032013-01-27 03:11:24[diff] [blame]1701 if gitConfigBool("git-p4.detectCopiesHarder"):
Gary Gibbons84cb0002012-07-04 13:40:19[diff] [blame]1702 self.diffOpts += " --find-copies-harder"
1703
Pete Wyckoff7e5dd9f2012-09-09 20:16:05[diff] [blame]1704 #
1705 # Apply the commits, one at a time. On failure, ask if should
1706 # continue to try the rest of the patches, or quit.
1707 #
Pete Wyckoffef739f02012-09-09 20:16:11[diff] [blame]1708 if self.dry_run:
1709 print "Would apply"
Pete Wyckoff67b0fe22012-09-09 20:16:03[diff] [blame]1710 applied = []
Pete Wyckoff7e5dd9f2012-09-09 20:16:05[diff] [blame]1711 last = len(commits) - 1
1712 for i, commit in enumerate(commits):
Pete Wyckoffef739f02012-09-09 20:16:11[diff] [blame]1713 if self.dry_run:
1714 print " ", read_pipe(["git", "show", "-s",
1715 "--format=format:%h %s", commit])
1716 ok = True
1717 else:
1718 ok = self.applyCommit(commit)
Pete Wyckoff67b0fe22012-09-09 20:16:03[diff] [blame]1719 if ok:
1720 applied.append(commit)
Pete Wyckoff7e5dd9f2012-09-09 20:16:05[diff] [blame]1721 else:
Pete Wyckoff728b7ad2012-09-09 20:16:12[diff] [blame]1722 if self.prepare_p4_only and i < last:
1723 print "Processing only the first commit due to option" \
1724 " --prepare-p4-only"
1725 break
Pete Wyckoff7e5dd9f2012-09-09 20:16:05[diff] [blame]1726 if i < last:
1727 quit = False
1728 while True:
Pete Wyckoff6bbfd132012-09-09 20:16:13[diff] [blame]1729 # prompt for what to do, or use the option/variable
1730 if self.conflict_behavior == "ask":
1731 print "What do you want to do?"
1732 response = raw_input("[s]kip this commit but apply"
1733 " the rest, or [q]uit? ")
1734 if not response:
1735 continue
1736 elif self.conflict_behavior == "skip":
1737 response = "s"
1738 elif self.conflict_behavior == "quit":
1739 response = "q"
1740 else:
1741 die("Unknown conflict_behavior '%s'" %
1742 self.conflict_behavior)
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1743
Pete Wyckoff7e5dd9f2012-09-09 20:16:05[diff] [blame]1744 if response[0] == "s":
1745 print "Skipping this commit, but applying the rest"
1746 break
1747 if response[0] == "q":
1748 print "Quitting"
1749 quit = True
1750 break
1751 if quit:
1752 break
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1753
Pete Wyckoff67b0fe22012-09-09 20:16:03[diff] [blame]1754 chdir(self.oldWorkingDirectory)
1755
Pete Wyckoffef739f02012-09-09 20:16:11[diff] [blame]1756 if self.dry_run:
1757 pass
Pete Wyckoff728b7ad2012-09-09 20:16:12[diff] [blame]1758 elif self.prepare_p4_only:
1759 pass
Pete Wyckoffef739f02012-09-09 20:16:11[diff] [blame]1760 elif len(commits) == len(applied):
Pete Wyckoff67b0fe22012-09-09 20:16:03[diff] [blame]1761 print "All commits applied!"
Simon Hausmann14594f42007-08-22 07:07:15[diff] [blame]1762
Simon Hausmann4c750c02008-02-19 08:37:16[diff] [blame]1763 sync = P4Sync()
Pete Wyckoff44e8d262013-01-15 00:47:08[diff] [blame]1764 if self.branch:
1765 sync.branch = self.branch
Simon Hausmann4c750c02008-02-19 08:37:16[diff] [blame]1766 sync.run([])
Simon Hausmann14594f42007-08-22 07:07:15[diff] [blame]1767
Simon Hausmann4c750c02008-02-19 08:37:16[diff] [blame]1768 rebase = P4Rebase()
1769 rebase.rebase()
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]1770
Pete Wyckoff67b0fe22012-09-09 20:16:03[diff] [blame]1771 else:
1772 if len(applied) == 0:
1773 print "No commits applied."
1774 else:
1775 print "Applied only the commits marked with '*':"
1776 for c in commits:
1777 if c in applied:
1778 star = "*"
1779 else:
1780 star = " "
1781 print star, read_pipe(["git", "show", "-s",
1782 "--format=format:%h %s", c])
1783 print "You will have to do 'git p4 sync' and rebase."
1784
Pete Wyckoff0d609032013-01-27 03:11:24[diff] [blame]1785 if gitConfigBool("git-p4.exportLabels"):
Luke Diamand06dcd152012-05-11 06:25:18[diff] [blame]1786 self.exportLabels = True
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]1787
1788 if self.exportLabels:
1789 p4Labels = getP4Labels(self.depotPath)
1790 gitTags = getGitTags()
1791
1792 missingGitTags = gitTags - p4Labels
1793 self.exportGitTags(missingGitTags)
1794
Ondřej Bílka98e023d2013-07-29 08:18:21[diff] [blame]1795 # exit with error unless everything applied perfectly
Pete Wyckoff67b0fe22012-09-09 20:16:03[diff] [blame]1796 if len(commits) != len(applied):
1797 sys.exit(1)
1798
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]1799 return True
1800
Pete Wyckoffecb7cf92012-01-02 23:05:53[diff] [blame]1801class View(object):
1802 """Represent a p4 view ("p4 help views"), and map files in a
1803 repo according to the view."""
1804
Kazuki Saitoh9d57c4a2013-08-30 10:02:06[diff] [blame]1805 def __init__(self, client_name):
Pete Wyckoffecb7cf92012-01-02 23:05:53[diff] [blame]1806 self.mappings = []
Kazuki Saitoh9d57c4a2013-08-30 10:02:06[diff] [blame]1807 self.client_prefix = "//%s/" % client_name
1808 # cache results of "p4 where" to lookup client file locations
1809 self.client_spec_path_cache = {}
Pete Wyckoffecb7cf92012-01-02 23:05:53[diff] [blame]1810
1811 def append(self, view_line):
1812 """Parse a view line, splitting it into depot and client
Kazuki Saitoh9d57c4a2013-08-30 10:02:06[diff] [blame]1813 sides. Append to self.mappings, preserving order. This
1814 is only needed for tag creation."""
Pete Wyckoffecb7cf92012-01-02 23:05:53[diff] [blame]1815
1816 # Split the view line into exactly two words. P4 enforces
1817 # structure on these lines that simplifies this quite a bit.
1818 #
1819 # Either or both words may be double-quoted.
1820 # Single quotes do not matter.
1821 # Double-quote marks cannot occur inside the words.
1822 # A + or - prefix is also inside the quotes.
1823 # There are no quotes unless they contain a space.
1824 # The line is already white-space stripped.
1825 # The two words are separated by a single space.
1826 #
1827 if view_line[0] == '"':
1828 # First word is double quoted. Find its end.
1829 close_quote_index = view_line.find('"', 1)
1830 if close_quote_index <= 0:
1831 die("No first-word closing quote found: %s" % view_line)
1832 depot_side = view_line[1:close_quote_index]
1833 # skip closing quote and space
1834 rhs_index = close_quote_index + 1 + 1
1835 else:
1836 space_index = view_line.find(" ")
1837 if space_index <= 0:
1838 die("No word-splitting space found: %s" % view_line)
1839 depot_side = view_line[0:space_index]
1840 rhs_index = space_index + 1
1841
Pete Wyckoffecb7cf92012-01-02 23:05:53[diff] [blame]1842 # prefix + means overlay on previous mapping
Pete Wyckoffecb7cf92012-01-02 23:05:53[diff] [blame]1843 if depot_side.startswith("+"):
Pete Wyckoffecb7cf92012-01-02 23:05:53[diff] [blame]1844 depot_side = depot_side[1:]
1845
Kazuki Saitoh9d57c4a2013-08-30 10:02:06[diff] [blame]1846 # prefix - means exclude this path, leave out of mappings
Pete Wyckoffecb7cf92012-01-02 23:05:53[diff] [blame]1847 exclude = False
1848 if depot_side.startswith("-"):
1849 exclude = True
1850 depot_side = depot_side[1:]
1851
Kazuki Saitoh9d57c4a2013-08-30 10:02:06[diff] [blame]1852 if not exclude:
1853 self.mappings.append(depot_side)
1854
1855 def convert_client_path(self, clientFile):
1856 # chop off //client/ part to make it relative
1857 if not clientFile.startswith(self.client_prefix):
1858 die("No prefix '%s' on clientFile '%s'" %
1859 (self.client_prefix, clientFile))
1860 return clientFile[len(self.client_prefix):]
1861
1862 def update_client_spec_path_cache(self, files):
1863 """ Caching file paths by "p4 where" batch query """
1864
1865 # List depot file paths exclude that already cached
1866 fileArgs = [f['path'] for f in files if f['path'] not in self.client_spec_path_cache]
1867
1868 if len(fileArgs) == 0:
1869 return # All files in cache
1870
1871 where_result = p4CmdList(["-x", "-", "where"], stdin=fileArgs)
1872 for res in where_result:
1873 if "code" in res and res["code"] == "error":
1874 # assume error is "... file(s) not in client view"
1875 continue
1876 if "clientFile" not in res:
Pete Wyckoff20005442014-01-21 23:16:46[diff] [blame]1877 die("No clientFile in 'p4 where' output")
Kazuki Saitoh9d57c4a2013-08-30 10:02:06[diff] [blame]1878 if "unmap" in res:
1879 # it will list all of them, but only one not unmap-ped
1880 continue
1881 self.client_spec_path_cache[res['depotFile']] = self.convert_client_path(res["clientFile"])
1882
1883 # not found files or unmap files set to ""
1884 for depotFile in fileArgs:
1885 if depotFile not in self.client_spec_path_cache:
1886 self.client_spec_path_cache[depotFile] = ""
Pete Wyckoffecb7cf92012-01-02 23:05:53[diff] [blame]1887
1888 def map_in_client(self, depot_path):
1889 """Return the relative location in the client where this
1890 depot file should live. Returns "" if the file should
1891 not be mapped in the client."""
1892
Kazuki Saitoh9d57c4a2013-08-30 10:02:06[diff] [blame]1893 if depot_path in self.client_spec_path_cache:
1894 return self.client_spec_path_cache[depot_path]
Pete Wyckoffecb7cf92012-01-02 23:05:53[diff] [blame]1895
Kazuki Saitoh9d57c4a2013-08-30 10:02:06[diff] [blame]1896 die( "Error: %s is not found in client spec path" % depot_path )
1897 return ""
Pete Wyckoffecb7cf92012-01-02 23:05:53[diff] [blame]1898
Luke Diamand3ea2cfd2011-04-21 19:50:23[diff] [blame]1899class P4Sync(Command, P4UserMap):
Pete Wyckoff56c09342011-02-19 13:17:57[diff] [blame]1900 delete_actions = ( "delete", "move/delete", "purge" )
1901
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]1902 def __init__(self):
1903 Command.__init__(self)
Luke Diamand3ea2cfd2011-04-21 19:50:23[diff] [blame]1904 P4UserMap.__init__(self)
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]1905 self.options = [
1906 optparse.make_option("--branch", dest="branch"),
1907 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),
1908 optparse.make_option("--changesfile", dest="changesFile"),
1909 optparse.make_option("--silent", dest="silent", action="store_true"),
Simon Hausmannef48f902007-05-17 20:17:49[diff] [blame]1910 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]1911 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),
Han-Wen Nienhuysd2c6dd32007-05-23 21:49:35[diff] [blame]1912 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",
1913 help="Import into refs/heads/ , not refs/remotes"),
Han-Wen Nienhuys8b41a972007-05-23 21:20:53[diff] [blame]1914 optparse.make_option("--max-changes", dest="maxChanges"),
Han-Wen Nienhuys86dff6b2007-05-23 21:49:35[diff] [blame]1915 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',
Tor Arvid Lund3a70cdf2008-02-18 14:22:08[diff] [blame]1916 help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),
1917 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',
Luke Diamand51334bb2015-01-17 20:56:38[diff] [blame]1918 help="Only sync files that are included in the Perforce Client Spec"),
1919 optparse.make_option("-/", dest="cloneExclude",
1920 action="append", type="string",
1921 help="exclude depot path"),
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]1922 ]
1923 self.description = """Imports from Perforce into a git repository.\n
1924 example:
1925 //depot/my/project/ -- to import the current head
1926 //depot/my/project/@all -- to import everything
1927 //depot/my/project/@1,6 -- to import only from revision 1 to 6
1928
1929 (a ... is not needed in the path p4 specification, it's added implicitly)"""
1930
1931 self.usage += " //depot/path[@revRange]"
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]1932 self.silent = False
Reilly Grant1d7367d2009-09-10 07:02:38[diff] [blame]1933 self.createdBranches = set()
1934 self.committedChanges = set()
Simon Hausmann569d1bd2007-03-22 20:34:16[diff] [blame]1935 self.branch = ""
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]1936 self.detectBranches = False
Simon Hausmanncb53e1f2007-04-07 22:12:02[diff] [blame]1937 self.detectLabels = False
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]1938 self.importLabels = False
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]1939 self.changesFile = ""
Simon Hausmann01265102007-05-25 08:36:10[diff] [blame]1940 self.syncWithOrigin = True
Simon Hausmanna028a982007-05-22 22:03:08[diff] [blame]1941 self.importIntoRemotes = True
Simon Hausmann01a9c9c2007-05-22 22:07:35[diff] [blame]1942 self.maxChanges = ""
Han-Wen Nienhuys8b41a972007-05-23 21:20:53[diff] [blame]1943 self.keepRepoPath = False
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]1944 self.depotPaths = None
Simon Hausmann3c699642007-06-16 11:09:21[diff] [blame]1945 self.p4BranchesInGit = []
Tommy Thorn354081d2008-02-03 18:38:51[diff] [blame]1946 self.cloneExclude = []
Tor Arvid Lund3a70cdf2008-02-18 14:22:08[diff] [blame]1947 self.useClientSpec = False
Pete Wyckoffa93d33e2012-02-26 01:06:24[diff] [blame]1948 self.useClientSpec_from_options = False
Pete Wyckoffecb7cf92012-01-02 23:05:53[diff] [blame]1949 self.clientSpecDirs = None
Vitor Antunesfed23692012-01-25 23:48:22[diff] [blame]1950 self.tempBranches = []
1951 self.tempBranchLocation = "git-p4-tmp"
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]1952
Simon Hausmann01265102007-05-25 08:36:10[diff] [blame]1953 if gitConfig("git-p4.syncFromOrigin") == "false":
1954 self.syncWithOrigin = False
1955
Luke Diamand51334bb2015-01-17 20:56:38[diff] [blame]1956 # This is required for the "append" cloneExclude action
1957 def ensure_value(self, attr, value):
1958 if not hasattr(self, attr) or getattr(self, attr) is None:
1959 setattr(self, attr, value)
1960 return getattr(self, attr)
1961
Vitor Antunesfed23692012-01-25 23:48:22[diff] [blame]1962 # Force a checkpoint in fast-import and wait for it to finish
1963 def checkpoint(self):
1964 self.gitStream.write("checkpoint\n\n")
1965 self.gitStream.write("progress checkpoint\n\n")
1966 out = self.gitOutput.readline()
1967 if self.verbose:
1968 print "checkpoint finished: " + out
1969
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]1970 def extractFilesFromCommit(self, commit):
Tommy Thorn354081d2008-02-03 18:38:51[diff] [blame]1971 self.cloneExclude = [re.sub(r"\.\.\.$", "", path)
1972 for path in self.cloneExclude]
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]1973 files = []
1974 fnum = 0
1975 while commit.has_key("depotFile%s" % fnum):
1976 path = commit["depotFile%s" % fnum]
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]1977
Tommy Thorn354081d2008-02-03 18:38:51[diff] [blame]1978 if [p for p in self.cloneExclude
Tor Arvid Lundd53de8b2011-03-15 12:08:02[diff] [blame]1979 if p4PathStartsWith(path, p)]:
Tommy Thorn354081d2008-02-03 18:38:51[diff] [blame]1980 found = False
1981 else:
1982 found = [p for p in self.depotPaths
Tor Arvid Lundd53de8b2011-03-15 12:08:02[diff] [blame]1983 if p4PathStartsWith(path, p)]
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]1984 if not found:
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]1985 fnum = fnum + 1
1986 continue
1987
1988 file = {}
1989 file["path"] = path
1990 file["rev"] = commit["rev%s" % fnum]
1991 file["action"] = commit["action%s" % fnum]
1992 file["type"] = commit["type%s" % fnum]
1993 files.append(file)
1994 fnum = fnum + 1
1995 return files
1996
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]1997 def stripRepoPath(self, path, prefixes):
Pete Wyckoff21ef5df2012-08-11 16:55:04[diff] [blame]1998 """When streaming files, this is called to map a p4 depot path
1999 to where it should go in git. The prefixes are either
2000 self.depotPaths, or self.branchPrefixes in the case of
2001 branch detection."""
2002
Ian Wienand39527102011-02-12 00:33:48[diff] [blame]2003 if self.useClientSpec:
Pete Wyckoff21ef5df2012-08-11 16:55:04[diff] [blame]2004 # branch detection moves files up a level (the branch name)
2005 # from what client spec interpretation gives
Pete Wyckoff0d1696e2012-08-11 16:55:03[diff] [blame]2006 path = self.clientSpecDirs.map_in_client(path)
Pete Wyckoff21ef5df2012-08-11 16:55:04[diff] [blame]2007 if self.detectBranches:
2008 for b in self.knownBranches:
2009 if path.startswith(b + "/"):
2010 path = path[len(b)+1:]
2011
2012 elif self.keepRepoPath:
2013 # Preserve everything in relative path name except leading
2014 # //depot/; just look at first prefix as they all should
2015 # be in the same depot.
2016 depot = re.sub("^(//[^/]+/).*", r'\1', prefixes[0])
2017 if p4PathStartsWith(path, depot):
2018 path = path[len(depot):]
Ian Wienand39527102011-02-12 00:33:48[diff] [blame]2019
Pete Wyckoff0d1696e2012-08-11 16:55:03[diff] [blame]2020 else:
Pete Wyckoff0d1696e2012-08-11 16:55:03[diff] [blame]2021 for p in prefixes:
2022 if p4PathStartsWith(path, p):
2023 path = path[len(p):]
Pete Wyckoff21ef5df2012-08-11 16:55:04[diff] [blame]2024 break
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2025
Pete Wyckoff0d1696e2012-08-11 16:55:03[diff] [blame]2026 path = wildcard_decode(path)
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2027 return path
Han-Wen Nienhuys6754a292007-05-23 20:41:50[diff] [blame]2028
Simon Hausmann71b112d2007-05-19 09:54:11[diff] [blame]2029 def splitFilesIntoBranches(self, commit):
Pete Wyckoff21ef5df2012-08-11 16:55:04[diff] [blame]2030 """Look at each depotFile in the commit to figure out to what
2031 branch it belongs."""
2032
Kazuki Saitoh9d57c4a2013-08-30 10:02:06[diff] [blame]2033 if self.clientSpecDirs:
2034 files = self.extractFilesFromCommit(commit)
2035 self.clientSpecDirs.update_client_spec_path_cache(files)
2036
Simon Hausmannd5904672007-05-19 09:07:32[diff] [blame]2037 branches = {}
Simon Hausmann71b112d2007-05-19 09:54:11[diff] [blame]2038 fnum = 0
2039 while commit.has_key("depotFile%s" % fnum):
2040 path = commit["depotFile%s" % fnum]
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2041 found = [p for p in self.depotPaths
Tor Arvid Lundd53de8b2011-03-15 12:08:02[diff] [blame]2042 if p4PathStartsWith(path, p)]
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2043 if not found:
Simon Hausmann71b112d2007-05-19 09:54:11[diff] [blame]2044 fnum = fnum + 1
2045 continue
2046
2047 file = {}
2048 file["path"] = path
2049 file["rev"] = commit["rev%s" % fnum]
2050 file["action"] = commit["action%s" % fnum]
2051 file["type"] = commit["type%s" % fnum]
2052 fnum = fnum + 1
2053
Pete Wyckoff21ef5df2012-08-11 16:55:04[diff] [blame]2054 # start with the full relative path where this file would
2055 # go in a p4 client
2056 if self.useClientSpec:
2057 relPath = self.clientSpecDirs.map_in_client(path)
2058 else:
2059 relPath = self.stripRepoPath(path, self.depotPaths)
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2060
Simon Hausmann4b97ffb2007-05-18 19:45:23[diff] [blame]2061 for branch in self.knownBranches.keys():
Pete Wyckoff21ef5df2012-08-11 16:55:04[diff] [blame]2062 # add a trailing slash so that a commit into qt/4.2foo
2063 # doesn't end up in qt/4.2, e.g.
Han-Wen Nienhuys6754a292007-05-23 20:41:50[diff] [blame]2064 if relPath.startswith(branch + "/"):
Simon Hausmannd5904672007-05-19 09:07:32[diff] [blame]2065 if branch not in branches:
2066 branches[branch] = []
Simon Hausmann71b112d2007-05-19 09:54:11[diff] [blame]2067 branches[branch].append(file)
Simon Hausmann6555b2c2007-06-17 09:25:34[diff] [blame]2068 break
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2069
2070 return branches
2071
Luke Diamandb9327052009-07-29 23:13:46[diff] [blame]2072 # output one file from the P4 stream
2073 # - helper for streamP4Files
2074
2075 def streamOneP4File(self, file, contents):
Luke Diamandb9327052009-07-29 23:13:46[diff] [blame]2076 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)
2077 if verbose:
2078 sys.stderr.write("%s\n" % relPath)
2079
Pete Wyckoff9cffb8c2011-10-16 14:45:01[diff] [blame]2080 (type_base, type_mods) = split_p4_type(file["type"])
2081
2082 git_mode = "100644"
2083 if "x" in type_mods:
2084 git_mode = "100755"
2085 if type_base == "symlink":
2086 git_mode = "120000"
Alexandru Juncu1292df12013-08-08 13:17:38[diff] [blame]2087 # p4 print on a symlink sometimes contains "target\n";
2088 # if it does, remove the newline
Evan Powersb39c3612010-02-16 08:44:08[diff] [blame]2089 data = ''.join(contents)
Pete Wyckoff40f846c2014-01-21 23:16:40[diff] [blame]2090 if not data:
2091 # Some version of p4 allowed creating a symlink that pointed
2092 # to nothing. This causes p4 errors when checking out such
2093 # a change, and errors here too. Work around it by ignoring
2094 # the bad symlink; hopefully a future change fixes it.
2095 print "\nIgnoring empty symlink in %s" % file['depotFile']
2096 return
2097 elif data[-1] == '\n':
Alexandru Juncu1292df12013-08-08 13:17:38[diff] [blame]2098 contents = [data[:-1]]
2099 else:
2100 contents = [data]
Luke Diamandb9327052009-07-29 23:13:46[diff] [blame]2101
Pete Wyckoff9cffb8c2011-10-16 14:45:01[diff] [blame]2102 if type_base == "utf16":
Pete Wyckoff55aa5712011-09-17 23:16:14[diff] [blame]2103 # p4 delivers different text in the python output to -G
2104 # than it does when using "print -o", or normal p4 client
2105 # operations. utf16 is converted to ascii or utf8, perhaps.
2106 # But ascii text saved as -t utf16 is completely mangled.
2107 # Invoke print -o to get the real contents.
Pete Wyckoff7f0e5962013-01-27 03:11:13[diff] [blame]2108 #
2109 # On windows, the newlines will always be mangled by print, so put
2110 # them back too. This is not needed to the cygwin windows version,
2111 # just the native "NT" type.
2112 #
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]2113 text = p4_read_pipe(['print', '-q', '-o', '-', file['depotFile']])
Pete Wyckoff7f0e5962013-01-27 03:11:13[diff] [blame]2114 if p4_version_string().find("/NT") >= 0:
2115 text = text.replace("\r\n", "\n")
Pete Wyckoff55aa5712011-09-17 23:16:14[diff] [blame]2116 contents = [ text ]
2117
Pete Wyckoff9f7ef0e2011-11-05 17:36:07[diff] [blame]2118 if type_base == "apple":
2119 # Apple filetype files will be streamed as a concatenation of
2120 # its appledouble header and the contents. This is useless
2121 # on both macs and non-macs. If using "print -q -o xx", it
2122 # will create "xx" with the data, and "%xx" with the header.
2123 # This is also not very useful.
2124 #
2125 # Ideally, someday, this script can learn how to generate
2126 # appledouble files directly and import those to git, but
2127 # non-mac machines can never find a use for apple filetype.
2128 print "\nIgnoring apple filetype file %s" % file['depotFile']
2129 return
2130
Pete Wyckoff55aa5712011-09-17 23:16:14[diff] [blame]2131 # Note that we do not try to de-mangle keywords on utf16 files,
2132 # even though in theory somebody may want that.
Luke Diamand60df0712012-02-23 07:51:30[diff] [blame]2133 pattern = p4_keywords_regexp_for_type(type_base, type_mods)
2134 if pattern:
2135 regexp = re.compile(pattern, re.VERBOSE)
2136 text = ''.join(contents)
2137 text = regexp.sub(r'$\1$', text)
2138 contents = [ text ]
Luke Diamandb9327052009-07-29 23:13:46[diff] [blame]2139
Pete Wyckoff9cffb8c2011-10-16 14:45:01[diff] [blame]2140 self.gitStream.write("M %s inline %s\n" % (git_mode, relPath))
Luke Diamandb9327052009-07-29 23:13:46[diff] [blame]2141
2142 # total length...
2143 length = 0
2144 for d in contents:
2145 length = length + len(d)
2146
2147 self.gitStream.write("data %d\n" % length)
2148 for d in contents:
2149 self.gitStream.write(d)
2150 self.gitStream.write("\n")
2151
2152 def streamOneP4Deletion(self, file):
2153 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)
2154 if verbose:
2155 sys.stderr.write("delete %s\n" % relPath)
2156 self.gitStream.write("D %s\n" % relPath)
2157
2158 # handle another chunk of streaming data
2159 def streamP4FilesCb(self, marshalled):
2160
Pete Wyckoff78189be2012-11-23 22:35:36[diff] [blame]2161 # catch p4 errors and complain
2162 err = None
2163 if "code" in marshalled:
2164 if marshalled["code"] == "error":
2165 if "data" in marshalled:
2166 err = marshalled["data"].rstrip()
2167 if err:
2168 f = None
2169 if self.stream_have_file_info:
2170 if "depotFile" in self.stream_file:
2171 f = self.stream_file["depotFile"]
2172 # force a failure in fast-import, else an empty
2173 # commit will be made
2174 self.gitStream.write("\n")
2175 self.gitStream.write("die-now\n")
2176 self.gitStream.close()
2177 # ignore errors, but make sure it exits first
2178 self.importProcess.wait()
2179 if f:
2180 die("Error from p4 print for %s: %s" % (f, err))
2181 else:
2182 die("Error from p4 print: %s" % err)
2183
Andrew Garberc3f61632011-04-07 06:01:21[diff] [blame]2184 if marshalled.has_key('depotFile') and self.stream_have_file_info:
2185 # start of a new file - output the old one first
2186 self.streamOneP4File(self.stream_file, self.stream_contents)
2187 self.stream_file = {}
2188 self.stream_contents = []
2189 self.stream_have_file_info = False
Luke Diamandb9327052009-07-29 23:13:46[diff] [blame]2190
Andrew Garberc3f61632011-04-07 06:01:21[diff] [blame]2191 # pick up the new file information... for the
2192 # 'data' field we need to append to our array
2193 for k in marshalled.keys():
2194 if k == 'data':
2195 self.stream_contents.append(marshalled['data'])
2196 else:
2197 self.stream_file[k] = marshalled[k]
Luke Diamandb9327052009-07-29 23:13:46[diff] [blame]2198
Andrew Garberc3f61632011-04-07 06:01:21[diff] [blame]2199 self.stream_have_file_info = True
Luke Diamandb9327052009-07-29 23:13:46[diff] [blame]2200
2201 # Stream directly from "p4 files" into "git fast-import"
2202 def streamP4Files(self, files):
Simon Hausmann30b59402008-03-03 10:55:48[diff] [blame]2203 filesForCommit = []
2204 filesToRead = []
Luke Diamandb9327052009-07-29 23:13:46[diff] [blame]2205 filesToDelete = []
Simon Hausmann30b59402008-03-03 10:55:48[diff] [blame]2206
Tor Arvid Lund3a70cdf2008-02-18 14:22:08[diff] [blame]2207 for f in files:
Pete Wyckoffecb7cf92012-01-02 23:05:53[diff] [blame]2208 # if using a client spec, only add the files that have
2209 # a path in the client
2210 if self.clientSpecDirs:
2211 if self.clientSpecDirs.map_in_client(f['path']) == "":
2212 continue
Tor Arvid Lund3a70cdf2008-02-18 14:22:08[diff] [blame]2213
Pete Wyckoffecb7cf92012-01-02 23:05:53[diff] [blame]2214 filesForCommit.append(f)
2215 if f['action'] in self.delete_actions:
2216 filesToDelete.append(f)
2217 else:
2218 filesToRead.append(f)
Han-Wen Nienhuys6a49f8e2007-05-23 21:49:35[diff] [blame]2219
Luke Diamandb9327052009-07-29 23:13:46[diff] [blame]2220 # deleted files...
2221 for f in filesToDelete:
2222 self.streamOneP4Deletion(f)
2223
Simon Hausmann30b59402008-03-03 10:55:48[diff] [blame]2224 if len(filesToRead) > 0:
Luke Diamandb9327052009-07-29 23:13:46[diff] [blame]2225 self.stream_file = {}
2226 self.stream_contents = []
2227 self.stream_have_file_info = False
2228
Andrew Garberc3f61632011-04-07 06:01:21[diff] [blame]2229 # curry self argument
2230 def streamP4FilesCbSelf(entry):
2231 self.streamP4FilesCb(entry)
Luke Diamandb9327052009-07-29 23:13:46[diff] [blame]2232
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]2233 fileArgs = ['%s#%s' % (f['path'], f['rev']) for f in filesToRead]
2234
2235 p4CmdList(["-x", "-", "print"],
2236 stdin=fileArgs,
2237 cb=streamP4FilesCbSelf)
Han-Wen Nienhuysf2eda792007-05-23 21:49:35[diff] [blame]2238
Luke Diamandb9327052009-07-29 23:13:46[diff] [blame]2239 # do the last chunk
2240 if self.stream_file.has_key('depotFile'):
2241 self.streamOneP4File(self.stream_file, self.stream_contents)
Han-Wen Nienhuys6a49f8e2007-05-23 21:49:35[diff] [blame]2242
Luke Diamandaffb4742012-01-19 09:52:27[diff] [blame]2243 def make_email(self, userid):
2244 if userid in self.users:
2245 return self.users[userid]
2246 else:
2247 return "%s <a@b>" % userid
2248
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]2249 # Stream a p4 tag
2250 def streamTag(self, gitStream, labelName, labelDetails, commit, epoch):
2251 if verbose:
2252 print "writing tag %s for commit %s" % (labelName, commit)
2253 gitStream.write("tag %s\n" % labelName)
2254 gitStream.write("from %s\n" % commit)
2255
2256 if labelDetails.has_key('Owner'):
2257 owner = labelDetails["Owner"]
2258 else:
2259 owner = None
2260
2261 # Try to use the owner of the p4 label, or failing that,
2262 # the current p4 user id.
2263 if owner:
2264 email = self.make_email(owner)
2265 else:
2266 email = self.make_email(self.p4UserId())
2267 tagger = "%s %s %s" % (email, epoch, self.tz)
2268
2269 gitStream.write("tagger %s\n" % tagger)
2270
2271 print "labelDetails=",labelDetails
2272 if labelDetails.has_key('Description'):
2273 description = labelDetails['Description']
2274 else:
2275 description = 'Label from git p4'
2276
2277 gitStream.write("data %d\n" % len(description))
2278 gitStream.write(description)
2279 gitStream.write("\n")
2280
Pete Wyckoffe63231e2012-08-11 16:55:02[diff] [blame]2281 def commit(self, details, files, branch, parent = ""):
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2282 epoch = details["time"]
2283 author = details["user"]
2284
Simon Hausmann4b97ffb2007-05-18 19:45:23[diff] [blame]2285 if self.verbose:
2286 print "commit into %s" % branch
2287
Han-Wen Nienhuys96e07dd2007-05-23 21:49:35[diff] [blame]2288 # start with reading files; if that fails, we should not
2289 # create a commit.
2290 new_files = []
2291 for f in files:
Pete Wyckoffe63231e2012-08-11 16:55:02[diff] [blame]2292 if [p for p in self.branchPrefixes if p4PathStartsWith(f['path'], p)]:
Han-Wen Nienhuys96e07dd2007-05-23 21:49:35[diff] [blame]2293 new_files.append (f)
2294 else:
Tor Arvid Lundafa1dd92011-03-15 12:08:03[diff] [blame]2295 sys.stderr.write("Ignoring file outside of prefix: %s\n" % f['path'])
Han-Wen Nienhuys96e07dd2007-05-23 21:49:35[diff] [blame]2296
Kazuki Saitoh9d57c4a2013-08-30 10:02:06[diff] [blame]2297 if self.clientSpecDirs:
2298 self.clientSpecDirs.update_client_spec_path_cache(files)
2299
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2300 self.gitStream.write("commit %s\n" % branch)
Han-Wen Nienhuys6a49f8e2007-05-23 21:49:35[diff] [blame]2301# gitStream.write("mark :%s\n" % details["change"])
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2302 self.committedChanges.add(int(details["change"]))
2303 committer = ""
Simon Hausmannb607e712007-05-20 08:55:54[diff] [blame]2304 if author not in self.users:
2305 self.getUserMapFromPerforceServer()
Luke Diamandaffb4742012-01-19 09:52:27[diff] [blame]2306 committer = "%s %s %s" % (self.make_email(author), epoch, self.tz)
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2307
2308 self.gitStream.write("committer %s\n" % committer)
2309
2310 self.gitStream.write("data <<EOT\n")
2311 self.gitStream.write(details["desc"])
Pete Wyckoffe63231e2012-08-11 16:55:02[diff] [blame]2312 self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s" %
2313 (','.join(self.branchPrefixes), details["change"]))
Simon Hausmann6581de02007-06-11 08:01:58[diff] [blame]2314 if len(details['options']) > 0:
2315 self.gitStream.write(": options = %s" % details['options'])
2316 self.gitStream.write("]\nEOT\n\n")
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2317
2318 if len(parent) > 0:
Simon Hausmann4b97ffb2007-05-18 19:45:23[diff] [blame]2319 if self.verbose:
2320 print "parent %s" % parent
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2321 self.gitStream.write("from %s\n" % parent)
2322
Luke Diamandb9327052009-07-29 23:13:46[diff] [blame]2323 self.streamP4Files(new_files)
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2324 self.gitStream.write("\n")
2325
Simon Hausmann1f4ba1c2007-03-26 20:34:34[diff] [blame]2326 change = int(details["change"])
2327
Simon Hausmann9bda3a82007-05-19 10:05:40[diff] [blame]2328 if self.labels.has_key(change):
Simon Hausmann1f4ba1c2007-03-26 20:34:34[diff] [blame]2329 label = self.labels[change]
2330 labelDetails = label[0]
2331 labelRevisions = label[1]
Simon Hausmann71b112d2007-05-19 09:54:11[diff] [blame]2332 if self.verbose:
2333 print "Change %s is labelled %s" % (change, labelDetails)
Simon Hausmann1f4ba1c2007-03-26 20:34:34[diff] [blame]2334
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]2335 files = p4CmdList(["files"] + ["%s...@%s" % (p, change)
Pete Wyckoffe63231e2012-08-11 16:55:02[diff] [blame]2336 for p in self.branchPrefixes])
Simon Hausmann1f4ba1c2007-03-26 20:34:34[diff] [blame]2337
2338 if len(files) == len(labelRevisions):
2339
2340 cleanedFiles = {}
2341 for info in files:
Pete Wyckoff56c09342011-02-19 13:17:57[diff] [blame]2342 if info["action"] in self.delete_actions:
Simon Hausmann1f4ba1c2007-03-26 20:34:34[diff] [blame]2343 continue
2344 cleanedFiles[info["depotFile"]] = info["rev"]
2345
2346 if cleanedFiles == labelRevisions:
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]2347 self.streamTag(self.gitStream, 'tag_%s' % labelDetails['label'], labelDetails, branch, epoch)
Simon Hausmann1f4ba1c2007-03-26 20:34:34[diff] [blame]2348
2349 else:
Simon Hausmanna46668f2007-03-28 15:05:38[diff] [blame]2350 if not self.silent:
Han-Wen Nienhuyscebdf5a2007-05-23 19:53:11[diff] [blame]2351 print ("Tag %s does not match with change %s: files do not match."
2352 % (labelDetails["label"], change))
Simon Hausmann1f4ba1c2007-03-26 20:34:34[diff] [blame]2353
2354 else:
Simon Hausmanna46668f2007-03-28 15:05:38[diff] [blame]2355 if not self.silent:
Han-Wen Nienhuyscebdf5a2007-05-23 19:53:11[diff] [blame]2356 print ("Tag %s does not match with change %s: file count is different."
2357 % (labelDetails["label"], change))
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2358
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]2359 # Build a dictionary of changelists and labels, for "detect-labels" option.
Simon Hausmann1f4ba1c2007-03-26 20:34:34[diff] [blame]2360 def getLabels(self):
2361 self.labels = {}
2362
Luke Diamand52a48802012-01-19 09:52:25[diff] [blame]2363 l = p4CmdList(["labels"] + ["%s..." % p for p in self.depotPaths])
Simon Hausmann10c32112007-04-08 08:15:47[diff] [blame]2364 if len(l) > 0 and not self.silent:
Shun Kei Leung183f8432007-11-21 03:01:19[diff] [blame]2365 print "Finding files belonging to labels in %s" % `self.depotPaths`
Simon Hausmann01ce1fe2007-04-07 21:46:50[diff] [blame]2366
2367 for output in l:
Simon Hausmann1f4ba1c2007-03-26 20:34:34[diff] [blame]2368 label = output["label"]
2369 revisions = {}
2370 newestChange = 0
Simon Hausmann71b112d2007-05-19 09:54:11[diff] [blame]2371 if self.verbose:
2372 print "Querying files for label %s" % label
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]2373 for file in p4CmdList(["files"] +
2374 ["%s...@%s" % (p, label)
2375 for p in self.depotPaths]):
Simon Hausmann1f4ba1c2007-03-26 20:34:34[diff] [blame]2376 revisions[file["depotFile"]] = file["rev"]
2377 change = int(file["change"])
2378 if change > newestChange:
2379 newestChange = change
2380
Simon Hausmann9bda3a82007-05-19 10:05:40[diff] [blame]2381 self.labels[newestChange] = [output, revisions]
2382
2383 if self.verbose:
2384 print "Label changes: %s" % self.labels.keys()
Simon Hausmann1f4ba1c2007-03-26 20:34:34[diff] [blame]2385
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]2386 # Import p4 labels as git tags. A direct mapping does not
2387 # exist, so assume that if all the files are at the same revision
2388 # then we can use that, or it's something more complicated we should
2389 # just ignore.
2390 def importP4Labels(self, stream, p4Labels):
2391 if verbose:
2392 print "import p4 labels: " + ' '.join(p4Labels)
2393
2394 ignoredP4Labels = gitConfigList("git-p4.ignoredP4Labels")
Luke Diamandc8942a22012-04-11 15:21:24[diff] [blame]2395 validLabelRegexp = gitConfig("git-p4.labelImportRegexp")
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]2396 if len(validLabelRegexp) == 0:
2397 validLabelRegexp = defaultLabelRegexp
2398 m = re.compile(validLabelRegexp)
2399
2400 for name in p4Labels:
2401 commitFound = False
2402
2403 if not m.match(name):
2404 if verbose:
2405 print "label %s does not match regexp %s" % (name,validLabelRegexp)
2406 continue
2407
2408 if name in ignoredP4Labels:
2409 continue
2410
2411 labelDetails = p4CmdList(['label', "-o", name])[0]
2412
2413 # get the most recent changelist for each file in this label
2414 change = p4Cmd(["changes", "-m", "1"] + ["%s...@%s" % (p, name)
2415 for p in self.depotPaths])
2416
2417 if change.has_key('change'):
2418 # find the corresponding git commit; take the oldest commit
2419 changelist = int(change['change'])
2420 gitCommit = read_pipe(["git", "rev-list", "--max-count=1",
2421 "--reverse", ":/\[git-p4:.*change = %d\]" % changelist])
2422 if len(gitCommit) == 0:
2423 print "could not find git commit for changelist %d" % changelist
2424 else:
2425 gitCommit = gitCommit.strip()
2426 commitFound = True
2427 # Convert from p4 time format
2428 try:
2429 tmwhen = time.strptime(labelDetails['Update'], "%Y/%m/%d %H:%M:%S")
2430 except ValueError:
Pete Wyckoffa4e90542012-11-23 22:35:38[diff] [blame]2431 print "Could not convert label time %s" % labelDetails['Update']
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]2432 tmwhen = 1
2433
2434 when = int(time.mktime(tmwhen))
2435 self.streamTag(stream, name, labelDetails, gitCommit, when)
2436 if verbose:
2437 print "p4 label %s mapped to git commit %s" % (name, gitCommit)
2438 else:
2439 if verbose:
2440 print "Label %s has no changelists - possibly deleted?" % name
2441
2442 if not commitFound:
2443 # We can't import this label; don't try again as it will get very
2444 # expensive repeatedly fetching all the files for labels that will
2445 # never be imported. If the label is moved in the future, the
2446 # ignore will need to be removed manually.
2447 system(["git", "config", "--add", "git-p4.ignoredP4Labels", name])
2448
Han-Wen Nienhuys86dff6b2007-05-23 21:49:35[diff] [blame]2449 def guessProjectName(self):
2450 for p in self.depotPaths:
Simon Hausmann6e5295c2007-06-11 06:50:57[diff] [blame]2451 if p.endswith("/"):
2452 p = p[:-1]
2453 p = p[p.strip().rfind("/") + 1:]
2454 if not p.endswith("/"):
2455 p += "/"
2456 return p
Han-Wen Nienhuys86dff6b2007-05-23 21:49:35[diff] [blame]2457
Simon Hausmann4b97ffb2007-05-18 19:45:23[diff] [blame]2458 def getBranchMapping(self):
Simon Hausmann6555b2c2007-06-17 09:25:34[diff] [blame]2459 lostAndFoundBranches = set()
2460
Vitor Antunes8ace74c2011-08-18 23:44:04[diff] [blame]2461 user = gitConfig("git-p4.branchUser")
2462 if len(user) > 0:
2463 command = "branches -u %s" % user
2464 else:
2465 command = "branches"
2466
2467 for info in p4CmdList(command):
Luke Diamand52a48802012-01-19 09:52:25[diff] [blame]2468 details = p4Cmd(["branch", "-o", info["branch"]])
Simon Hausmann4b97ffb2007-05-18 19:45:23[diff] [blame]2469 viewIdx = 0
2470 while details.has_key("View%s" % viewIdx):
2471 paths = details["View%s" % viewIdx].split(" ")
2472 viewIdx = viewIdx + 1
2473 # require standard //depot/foo/... //depot/bar/... mapping
2474 if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."):
2475 continue
2476 source = paths[0]
2477 destination = paths[1]
Simon Hausmann6509e192007-06-07 07:41:53[diff] [blame]2478 ## HACK
Tor Arvid Lundd53de8b2011-03-15 12:08:02[diff] [blame]2479 if p4PathStartsWith(source, self.depotPaths[0]) and p4PathStartsWith(destination, self.depotPaths[0]):
Simon Hausmann6509e192007-06-07 07:41:53[diff] [blame]2480 source = source[len(self.depotPaths[0]):-4]
2481 destination = destination[len(self.depotPaths[0]):-4]
Simon Hausmann6555b2c2007-06-17 09:25:34[diff] [blame]2482
Simon Hausmann1a2edf42007-06-17 13:10:24[diff] [blame]2483 if destination in self.knownBranches:
2484 if not self.silent:
2485 print "p4 branch %s defines a mapping from %s to %s" % (info["branch"], source, destination)
2486 print "but there exists another mapping from %s to %s already!" % (self.knownBranches[destination], destination)
2487 continue
2488
Simon Hausmann6555b2c2007-06-17 09:25:34[diff] [blame]2489 self.knownBranches[destination] = source
2490
2491 lostAndFoundBranches.discard(destination)
2492
Simon Hausmann29bdbac2007-05-19 08:23:12[diff] [blame]2493 if source not in self.knownBranches:
Simon Hausmann6555b2c2007-06-17 09:25:34[diff] [blame]2494 lostAndFoundBranches.add(source)
2495
Vitor Antunes7199cf12011-08-18 23:44:05[diff] [blame]2496 # Perforce does not strictly require branches to be defined, so we also
2497 # check git config for a branch list.
2498 #
2499 # Example of branch definition in git config file:
2500 # [git-p4]
2501 # branchList=main:branchA
2502 # branchList=main:branchB
2503 # branchList=branchA:branchC
2504 configBranches = gitConfigList("git-p4.branchList")
2505 for branch in configBranches:
2506 if branch:
2507 (source, destination) = branch.split(":")
2508 self.knownBranches[destination] = source
2509
2510 lostAndFoundBranches.discard(destination)
2511
2512 if source not in self.knownBranches:
2513 lostAndFoundBranches.add(source)
2514
Simon Hausmann6555b2c2007-06-17 09:25:34[diff] [blame]2515
2516 for branch in lostAndFoundBranches:
2517 self.knownBranches[branch] = branch
Simon Hausmann29bdbac2007-05-19 08:23:12[diff] [blame]2518
Simon Hausmann38f9f5e2007-11-15 09:38:45[diff] [blame]2519 def getBranchMappingFromGitBranches(self):
2520 branches = p4BranchesInGit(self.importIntoRemotes)
2521 for branch in branches.keys():
2522 if branch == "master":
2523 branch = "main"
2524 else:
2525 branch = branch[len(self.projectName):]
2526 self.knownBranches[branch] = branch
2527
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]2528 def updateOptionDict(self, d):
2529 option_keys = {}
2530 if self.keepRepoPath:
2531 option_keys['keepRepoPath'] = 1
2532
2533 d["options"] = ' '.join(sorted(option_keys.keys()))
2534
2535 def readOptions(self, d):
2536 self.keepRepoPath = (d.has_key('options')
2537 and ('keepRepoPath' in d['options']))
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2538
Simon Hausmann8134f692007-08-26 14:44:55[diff] [blame]2539 def gitRefForBranch(self, branch):
2540 if branch == "main":
2541 return self.refPrefix + "master"
2542
2543 if len(branch) <= 0:
2544 return branch
2545
2546 return self.refPrefix + self.projectName + branch
2547
Simon Hausmann1ca3d712007-08-26 15:36:55[diff] [blame]2548 def gitCommitByP4Change(self, ref, change):
2549 if self.verbose:
2550 print "looking in ref " + ref + " for change %s using bisect..." % change
2551
2552 earliestCommit = ""
2553 latestCommit = parseRevision(ref)
2554
2555 while True:
2556 if self.verbose:
2557 print "trying: earliest %s latest %s" % (earliestCommit, latestCommit)
2558 next = read_pipe("git rev-list --bisect %s %s" % (latestCommit, earliestCommit)).strip()
2559 if len(next) == 0:
2560 if self.verbose:
2561 print "argh"
2562 return ""
2563 log = extractLogMessageFromGitCommit(next)
2564 settings = extractSettingsGitLog(log)
2565 currentChange = int(settings['change'])
2566 if self.verbose:
2567 print "current change %s" % currentChange
2568
2569 if currentChange == change:
2570 if self.verbose:
2571 print "found %s" % next
2572 return next
2573
2574 if currentChange < change:
2575 earliestCommit = "^%s" % next
2576 else:
2577 latestCommit = "%s" % next
2578
2579 return ""
2580
2581 def importNewBranch(self, branch, maxChange):
2582 # make fast-import flush all changes to disk and update the refs using the checkpoint
2583 # command so that we can try to find the branch parent in the git history
2584 self.gitStream.write("checkpoint\n\n");
2585 self.gitStream.flush();
2586 branchPrefix = self.depotPaths[0] + branch + "/"
2587 range = "@1,%s" % maxChange
2588 #print "prefix" + branchPrefix
2589 changes = p4ChangesForPaths([branchPrefix], range)
2590 if len(changes) <= 0:
2591 return False
2592 firstChange = changes[0]
2593 #print "first change in branch: %s" % firstChange
2594 sourceBranch = self.knownBranches[branch]
2595 sourceDepotPath = self.depotPaths[0] + sourceBranch
2596 sourceRef = self.gitRefForBranch(sourceBranch)
2597 #print "source " + sourceBranch
2598
Luke Diamand52a48802012-01-19 09:52:25[diff] [blame]2599 branchParentChange = int(p4Cmd(["changes", "-m", "1", "%s...@1,%s" % (sourceDepotPath, firstChange)])["change"])
Simon Hausmann1ca3d712007-08-26 15:36:55[diff] [blame]2600 #print "branch parent: %s" % branchParentChange
2601 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)
2602 if len(gitParent) > 0:
2603 self.initialParents[self.gitRefForBranch(branch)] = gitParent
2604 #print "parent git commit: %s" % gitParent
2605
2606 self.importChanges(changes)
2607 return True
2608
Vitor Antunesfed23692012-01-25 23:48:22[diff] [blame]2609 def searchParent(self, parent, branch, target):
2610 parentFound = False
Pete Wyckoffc7d34882013-01-27 03:11:21[diff] [blame]2611 for blob in read_pipe_lines(["git", "rev-list", "--reverse",
2612 "--no-merges", parent]):
Vitor Antunesfed23692012-01-25 23:48:22[diff] [blame]2613 blob = blob.strip()
2614 if len(read_pipe(["git", "diff-tree", blob, target])) == 0:
2615 parentFound = True
2616 if self.verbose:
2617 print "Found parent of %s in commit %s" % (branch, blob)
2618 break
2619 if parentFound:
2620 return blob
2621 else:
2622 return None
2623
Simon Hausmanne87f37a2007-08-26 14:00:52[diff] [blame]2624 def importChanges(self, changes):
2625 cnt = 1
2626 for change in changes:
Pete Wyckoff18fa13d2012-11-23 22:35:34[diff] [blame]2627 description = p4_describe(change)
Simon Hausmanne87f37a2007-08-26 14:00:52[diff] [blame]2628 self.updateOptionDict(description)
2629
2630 if not self.silent:
2631 sys.stdout.write("\rImporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
2632 sys.stdout.flush()
2633 cnt = cnt + 1
2634
2635 try:
2636 if self.detectBranches:
2637 branches = self.splitFilesIntoBranches(description)
2638 for branch in branches.keys():
2639 ## HACK --hwn
2640 branchPrefix = self.depotPaths[0] + branch + "/"
Pete Wyckoffe63231e2012-08-11 16:55:02[diff] [blame]2641 self.branchPrefixes = [ branchPrefix ]
Simon Hausmanne87f37a2007-08-26 14:00:52[diff] [blame]2642
2643 parent = ""
2644
2645 filesForCommit = branches[branch]
2646
2647 if self.verbose:
2648 print "branch is %s" % branch
2649
2650 self.updatedBranches.add(branch)
2651
2652 if branch not in self.createdBranches:
2653 self.createdBranches.add(branch)
2654 parent = self.knownBranches[branch]
2655 if parent == branch:
2656 parent = ""
Simon Hausmann1ca3d712007-08-26 15:36:55[diff] [blame]2657 else:
2658 fullBranch = self.projectName + branch
2659 if fullBranch not in self.p4BranchesInGit:
2660 if not self.silent:
2661 print("\n Importing new branch %s" % fullBranch);
2662 if self.importNewBranch(branch, change - 1):
2663 parent = ""
2664 self.p4BranchesInGit.append(fullBranch)
2665 if not self.silent:
2666 print("\n Resuming with change %s" % change);
2667
2668 if self.verbose:
2669 print "parent determined through known branches: %s" % parent
Simon Hausmanne87f37a2007-08-26 14:00:52[diff] [blame]2670
Simon Hausmann8134f692007-08-26 14:44:55[diff] [blame]2671 branch = self.gitRefForBranch(branch)
2672 parent = self.gitRefForBranch(parent)
Simon Hausmanne87f37a2007-08-26 14:00:52[diff] [blame]2673
2674 if self.verbose:
2675 print "looking for initial parent for %s; current parent is %s" % (branch, parent)
2676
2677 if len(parent) == 0 and branch in self.initialParents:
2678 parent = self.initialParents[branch]
2679 del self.initialParents[branch]
2680
Vitor Antunesfed23692012-01-25 23:48:22[diff] [blame]2681 blob = None
2682 if len(parent) > 0:
Pete Wyckoff4f9273d2013-01-27 03:11:04[diff] [blame]2683 tempBranch = "%s/%d" % (self.tempBranchLocation, change)
Vitor Antunesfed23692012-01-25 23:48:22[diff] [blame]2684 if self.verbose:
2685 print "Creating temporary branch: " + tempBranch
Pete Wyckoffe63231e2012-08-11 16:55:02[diff] [blame]2686 self.commit(description, filesForCommit, tempBranch)
Vitor Antunesfed23692012-01-25 23:48:22[diff] [blame]2687 self.tempBranches.append(tempBranch)
2688 self.checkpoint()
2689 blob = self.searchParent(parent, branch, tempBranch)
2690 if blob:
Pete Wyckoffe63231e2012-08-11 16:55:02[diff] [blame]2691 self.commit(description, filesForCommit, branch, blob)
Vitor Antunesfed23692012-01-25 23:48:22[diff] [blame]2692 else:
2693 if self.verbose:
2694 print "Parent of %s not found. Committing into head of %s" % (branch, parent)
Pete Wyckoffe63231e2012-08-11 16:55:02[diff] [blame]2695 self.commit(description, filesForCommit, branch, parent)
Simon Hausmanne87f37a2007-08-26 14:00:52[diff] [blame]2696 else:
2697 files = self.extractFilesFromCommit(description)
Pete Wyckoffe63231e2012-08-11 16:55:02[diff] [blame]2698 self.commit(description, files, self.branch,
Simon Hausmanne87f37a2007-08-26 14:00:52[diff] [blame]2699 self.initialParent)
Pete Wyckoff47497842013-01-15 00:47:04[diff] [blame]2700 # only needed once, to connect to the previous commit
Simon Hausmanne87f37a2007-08-26 14:00:52[diff] [blame]2701 self.initialParent = ""
2702 except IOError:
2703 print self.gitError.read()
2704 sys.exit(1)
2705
Simon Hausmannc208a242007-08-26 14:07:18[diff] [blame]2706 def importHeadRevision(self, revision):
2707 print "Doing initial import of %s from revision %s into %s" % (' '.join(self.depotPaths), revision, self.branch)
2708
Pete Wyckoff4e2e6ce2011-07-31 13:45:55[diff] [blame]2709 details = {}
2710 details["user"] = "git perforce import user"
Pete Wyckoff1494fcb2011-02-19 13:17:56[diff] [blame]2711 details["desc"] = ("Initial import of %s from the state at revision %s\n"
Simon Hausmannc208a242007-08-26 14:07:18[diff] [blame]2712 % (' '.join(self.depotPaths), revision))
2713 details["change"] = revision
2714 newestRevision = 0
2715
2716 fileCnt = 0
Luke Diamand6de040d2011-10-16 14:47:52[diff] [blame]2717 fileArgs = ["%s...%s" % (p,revision) for p in self.depotPaths]
2718
2719 for info in p4CmdList(["files"] + fileArgs):
Simon Hausmannc208a242007-08-26 14:07:18[diff] [blame]2720
Pete Wyckoff68b28592011-02-19 13:17:55[diff] [blame]2721 if 'code' in info and info['code'] == 'error':
Simon Hausmannc208a242007-08-26 14:07:18[diff] [blame]2722 sys.stderr.write("p4 returned an error: %s\n"
2723 % info['data'])
Pete Wyckoffd88e7072011-02-19 13:17:58[diff] [blame]2724 if info['data'].find("must refer to client") >= 0:
2725 sys.stderr.write("This particular p4 error is misleading.\n")
2726 sys.stderr.write("Perhaps the depot path was misspelled.\n");
2727 sys.stderr.write("Depot path: %s\n" % " ".join(self.depotPaths))
Simon Hausmannc208a242007-08-26 14:07:18[diff] [blame]2728 sys.exit(1)
Pete Wyckoff68b28592011-02-19 13:17:55[diff] [blame]2729 if 'p4ExitCode' in info:
2730 sys.stderr.write("p4 exitcode: %s\n" % info['p4ExitCode'])
Simon Hausmannc208a242007-08-26 14:07:18[diff] [blame]2731 sys.exit(1)
2732
2733
2734 change = int(info["change"])
2735 if change > newestRevision:
2736 newestRevision = change
2737
Pete Wyckoff56c09342011-02-19 13:17:57[diff] [blame]2738 if info["action"] in self.delete_actions:
Simon Hausmannc208a242007-08-26 14:07:18[diff] [blame]2739 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
2740 #fileCnt = fileCnt + 1
2741 continue
2742
2743 for prop in ["depotFile", "rev", "action", "type" ]:
2744 details["%s%s" % (prop, fileCnt)] = info[prop]
2745
2746 fileCnt = fileCnt + 1
2747
2748 details["change"] = newestRevision
Pete Wyckoff4e2e6ce2011-07-31 13:45:55[diff] [blame]2749
Pete Wyckoff9dcb9f22012-04-09 00:18:01[diff] [blame]2750 # Use time from top-most change so that all git p4 clones of
Pete Wyckoff4e2e6ce2011-07-31 13:45:55[diff] [blame]2751 # the same p4 repo have the same commit SHA1s.
Pete Wyckoff18fa13d2012-11-23 22:35:34[diff] [blame]2752 res = p4_describe(newestRevision)
2753 details["time"] = res["time"]
Pete Wyckoff4e2e6ce2011-07-31 13:45:55[diff] [blame]2754
Simon Hausmannc208a242007-08-26 14:07:18[diff] [blame]2755 self.updateOptionDict(details)
2756 try:
Pete Wyckoffe63231e2012-08-11 16:55:02[diff] [blame]2757 self.commit(details, self.extractFilesFromCommit(details), self.branch)
Simon Hausmannc208a242007-08-26 14:07:18[diff] [blame]2758 except IOError:
2759 print "IO error with git fast-import. Is your git version recent enough?"
2760 print self.gitError.read()
2761
2762
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2763 def run(self, args):
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2764 self.depotPaths = []
Simon Hausmann179caeb2007-03-22 21:17:42[diff] [blame]2765 self.changeRange = ""
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2766 self.previousDepotPaths = []
Pete Wyckoff991a2de2013-01-15 00:46:56[diff] [blame]2767 self.hasOrigin = False
Han-Wen Nienhuysce6f33c2007-05-23 19:46:29[diff] [blame]2768
Simon Hausmann29bdbac2007-05-19 08:23:12[diff] [blame]2769 # map from branch depot path to parent branch
2770 self.knownBranches = {}
2771 self.initialParents = {}
Simon Hausmann179caeb2007-03-22 21:17:42[diff] [blame]2772
Simon Hausmanna028a982007-05-22 22:03:08[diff] [blame]2773 if self.importIntoRemotes:
2774 self.refPrefix = "refs/remotes/p4/"
2775 else:
Marius Storm-Olsendb775552007-06-07 13:13:59[diff] [blame]2776 self.refPrefix = "refs/heads/p4/"
Simon Hausmanna028a982007-05-22 22:03:08[diff] [blame]2777
Pete Wyckoff991a2de2013-01-15 00:46:56[diff] [blame]2778 if self.syncWithOrigin:
2779 self.hasOrigin = originP4BranchesExist()
2780 if self.hasOrigin:
2781 if not self.silent:
2782 print 'Syncing with origin first, using "git fetch origin"'
2783 system("git fetch origin")
Simon Hausmann10f880f2007-05-24 20:28:28[diff] [blame]2784
Pete Wyckoff5a8e84c2013-01-15 00:47:05[diff] [blame]2785 branch_arg_given = bool(self.branch)
Simon Hausmann569d1bd2007-03-22 20:34:16[diff] [blame]2786 if len(self.branch) == 0:
Marius Storm-Olsendb775552007-06-07 13:13:59[diff] [blame]2787 self.branch = self.refPrefix + "master"
Simon Hausmanna028a982007-05-22 22:03:08[diff] [blame]2788 if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
Simon Hausmann48df6fd2007-05-17 19:18:53[diff] [blame]2789 system("git update-ref %s refs/heads/p4" % self.branch)
Pete Wyckoff55d12432013-01-15 00:46:59[diff] [blame]2790 system("git branch -D p4")
Simon Hausmann179caeb2007-03-22 21:17:42[diff] [blame]2791
Pete Wyckoffa93d33e2012-02-26 01:06:24[diff] [blame]2792 # accept either the command-line option, or the configuration variable
2793 if self.useClientSpec:
2794 # will use this after clone to set the variable
2795 self.useClientSpec_from_options = True
2796 else:
Pete Wyckoff0d609032013-01-27 03:11:24[diff] [blame]2797 if gitConfigBool("git-p4.useclientspec"):
Pete Wyckoff09fca772011-12-25 02:07:39[diff] [blame]2798 self.useClientSpec = True
2799 if self.useClientSpec:
Pete Wyckoff543987b2012-02-26 01:06:25[diff] [blame]2800 self.clientSpecDirs = getClientSpec()
Tor Arvid Lund3a70cdf2008-02-18 14:22:08[diff] [blame]2801
Han-Wen Nienhuys6a49f8e2007-05-23 21:49:35[diff] [blame]2802 # TODO: should always look at previous commits,
2803 # merge with previous imports, if possible.
2804 if args == []:
Simon Hausmannd414c742007-05-25 09:36:42[diff] [blame]2805 if self.hasOrigin:
Simon Hausmann5ca44612007-08-24 15:44:16[diff] [blame]2806 createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)
Pete Wyckoff3b650fc2013-01-15 00:46:58[diff] [blame]2807
2808 # branches holds mapping from branch name to sha1
2809 branches = p4BranchesInGit(self.importIntoRemotes)
Pete Wyckoff8c9e8b62013-01-15 00:47:06[diff] [blame]2810
2811 # restrict to just this one, disabling detect-branches
2812 if branch_arg_given:
2813 short = self.branch.split("/")[-1]
2814 if short in branches:
2815 self.p4BranchesInGit = [ short ]
2816 else:
2817 self.p4BranchesInGit = branches.keys()
Simon Hausmannabcd7902007-05-24 20:25:36[diff] [blame]2818
2819 if len(self.p4BranchesInGit) > 1:
2820 if not self.silent:
2821 print "Importing from/into multiple branches"
2822 self.detectBranches = True
Pete Wyckoff8c9e8b62013-01-15 00:47:06[diff] [blame]2823 for branch in branches.keys():
2824 self.initialParents[self.refPrefix + branch] = \
2825 branches[branch]
Simon Hausmann967f72e2007-03-23 08:30:41[diff] [blame]2826
Simon Hausmann29bdbac2007-05-19 08:23:12[diff] [blame]2827 if self.verbose:
2828 print "branches: %s" % self.p4BranchesInGit
2829
2830 p4Change = 0
2831 for branch in self.p4BranchesInGit:
Han-Wen Nienhuyscebdf5a2007-05-23 19:53:11[diff] [blame]2832 logMsg = extractLogMessageFromGitCommit(self.refPrefix + branch)
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]2833
2834 settings = extractSettingsGitLog(logMsg)
Simon Hausmann29bdbac2007-05-19 08:23:12[diff] [blame]2835
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]2836 self.readOptions(settings)
2837 if (settings.has_key('depot-paths')
2838 and settings.has_key ('change')):
2839 change = int(settings['change']) + 1
Simon Hausmann29bdbac2007-05-19 08:23:12[diff] [blame]2840 p4Change = max(p4Change, change)
2841
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]2842 depotPaths = sorted(settings['depot-paths'])
2843 if self.previousDepotPaths == []:
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2844 self.previousDepotPaths = depotPaths
Simon Hausmann29bdbac2007-05-19 08:23:12[diff] [blame]2845 else:
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2846 paths = []
2847 for (prev, cur) in zip(self.previousDepotPaths, depotPaths):
Vitor Antunes04d277b2011-08-18 23:44:03[diff] [blame]2848 prev_list = prev.split("/")
2849 cur_list = cur.split("/")
2850 for i in range(0, min(len(cur_list), len(prev_list))):
2851 if cur_list[i] <> prev_list[i]:
Simon Hausmann583e1702007-06-07 07:37:13[diff] [blame]2852 i = i - 1
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2853 break
2854
Vitor Antunes04d277b2011-08-18 23:44:03[diff] [blame]2855 paths.append ("/".join(cur_list[:i + 1]))
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2856
2857 self.previousDepotPaths = paths
Simon Hausmann29bdbac2007-05-19 08:23:12[diff] [blame]2858
2859 if p4Change > 0:
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]2860 self.depotPaths = sorted(self.previousDepotPaths)
Simon Hausmannd5904672007-05-19 09:07:32[diff] [blame]2861 self.changeRange = "@%s,#head" % p4Change
Simon Hausmann341dc1c2007-05-20 22:39:16[diff] [blame]2862 if not self.silent and not self.detectBranches:
Simon Hausmann967f72e2007-03-23 08:30:41[diff] [blame]2863 print "Performing incremental import into %s git branch" % self.branch
Simon Hausmann569d1bd2007-03-22 20:34:16[diff] [blame]2864
Pete Wyckoff40d69ac2013-01-15 00:47:03[diff] [blame]2865 # accept multiple ref name abbreviations:
2866 # refs/foo/bar/branch -> use it exactly
2867 # p4/branch -> prepend refs/remotes/ or refs/heads/
2868 # branch -> prepend refs/remotes/p4/ or refs/heads/p4/
Simon Hausmannf9162f62007-05-17 07:02:45[diff] [blame]2869 if not self.branch.startswith("refs/"):
Pete Wyckoff40d69ac2013-01-15 00:47:03[diff] [blame]2870 if self.importIntoRemotes:
2871 prepend = "refs/remotes/"
2872 else:
2873 prepend = "refs/heads/"
2874 if not self.branch.startswith("p4/"):
2875 prepend += "p4/"
2876 self.branch = prepend + self.branch
Simon Hausmann179caeb2007-03-22 21:17:42[diff] [blame]2877
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2878 if len(args) == 0 and self.depotPaths:
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2879 if not self.silent:
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2880 print "Depot paths: %s" % ' '.join(self.depotPaths)
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2881 else:
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2882 if self.depotPaths and self.depotPaths != args:
Han-Wen Nienhuyscebdf5a2007-05-23 19:53:11[diff] [blame]2883 print ("previous import used depot path %s and now %s was specified. "
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2884 "This doesn't work!" % (' '.join (self.depotPaths),
2885 ' '.join (args)))
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2886 sys.exit(1)
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2887
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]2888 self.depotPaths = sorted(args)
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2889
Simon Hausmann1c49fc12007-08-26 14:04:34[diff] [blame]2890 revision = ""
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2891 self.users = {}
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2892
Pete Wyckoff58c8bc72011-12-25 02:07:35[diff] [blame]2893 # Make sure no revision specifiers are used when --changesfile
2894 # is specified.
2895 bad_changesfile = False
2896 if len(self.changesFile) > 0:
2897 for p in self.depotPaths:
2898 if p.find("@") >= 0 or p.find("#") >= 0:
2899 bad_changesfile = True
2900 break
2901 if bad_changesfile:
2902 die("Option --changesfile is incompatible with revision specifiers")
2903
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2904 newPaths = []
2905 for p in self.depotPaths:
2906 if p.find("@") != -1:
2907 atIdx = p.index("@")
2908 self.changeRange = p[atIdx:]
2909 if self.changeRange == "@all":
2910 self.changeRange = ""
Han-Wen Nienhuys6a49f8e2007-05-23 21:49:35[diff] [blame]2911 elif ',' not in self.changeRange:
Simon Hausmann1c49fc12007-08-26 14:04:34[diff] [blame]2912 revision = self.changeRange
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2913 self.changeRange = ""
Han-Wen Nienhuys7fcff9d2007-07-23 22:56:37[diff] [blame]2914 p = p[:atIdx]
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2915 elif p.find("#") != -1:
2916 hashIdx = p.index("#")
Simon Hausmann1c49fc12007-08-26 14:04:34[diff] [blame]2917 revision = p[hashIdx:]
Han-Wen Nienhuys7fcff9d2007-07-23 22:56:37[diff] [blame]2918 p = p[:hashIdx]
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2919 elif self.previousDepotPaths == []:
Pete Wyckoff58c8bc72011-12-25 02:07:35[diff] [blame]2920 # pay attention to changesfile, if given, else import
2921 # the entire p4 tree at the head revision
2922 if len(self.changesFile) == 0:
2923 revision = "#head"
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2924
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2925 p = re.sub ("\.\.\.$", "", p)
2926 if not p.endswith("/"):
2927 p += "/"
2928
2929 newPaths.append(p)
2930
2931 self.depotPaths = newPaths
2932
Pete Wyckoffe63231e2012-08-11 16:55:02[diff] [blame]2933 # --detect-branches may change this for each branch
2934 self.branchPrefixes = self.depotPaths
2935
Simon Hausmannb607e712007-05-20 08:55:54[diff] [blame]2936 self.loadUserMapFromCache()
Simon Hausmanncb53e1f2007-04-07 22:12:02[diff] [blame]2937 self.labels = {}
2938 if self.detectLabels:
2939 self.getLabels();
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2940
Simon Hausmann4b97ffb2007-05-18 19:45:23[diff] [blame]2941 if self.detectBranches:
Simon Hausmanndf450922007-06-08 06:49:22[diff] [blame]2942 ## FIXME - what's a P4 projectName ?
2943 self.projectName = self.guessProjectName()
2944
Simon Hausmann38f9f5e2007-11-15 09:38:45[diff] [blame]2945 if self.hasOrigin:
2946 self.getBranchMappingFromGitBranches()
2947 else:
2948 self.getBranchMapping()
Simon Hausmann29bdbac2007-05-19 08:23:12[diff] [blame]2949 if self.verbose:
2950 print "p4-git branches: %s" % self.p4BranchesInGit
2951 print "initial parents: %s" % self.initialParents
2952 for b in self.p4BranchesInGit:
2953 if b != "master":
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]2954
2955 ## FIXME
Simon Hausmann29bdbac2007-05-19 08:23:12[diff] [blame]2956 b = b[len(self.projectName):]
2957 self.createdBranches.add(b)
Simon Hausmann4b97ffb2007-05-18 19:45:23[diff] [blame]2958
Simon Hausmannf291b4e2007-04-14 09:21:50[diff] [blame]2959 self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2960
Pete Wyckoff78189be2012-11-23 22:35:36[diff] [blame]2961 self.importProcess = subprocess.Popen(["git", "fast-import"],
2962 stdin=subprocess.PIPE,
2963 stdout=subprocess.PIPE,
2964 stderr=subprocess.PIPE);
2965 self.gitOutput = self.importProcess.stdout
2966 self.gitStream = self.importProcess.stdin
2967 self.gitError = self.importProcess.stderr
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2968
Simon Hausmann1c49fc12007-08-26 14:04:34[diff] [blame]2969 if revision:
Simon Hausmannc208a242007-08-26 14:07:18[diff] [blame]2970 self.importHeadRevision(revision)
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2971 else:
2972 changes = []
2973
Simon Hausmann0828ab12007-03-20 19:59:30[diff] [blame]2974 if len(self.changesFile) > 0:
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2975 output = open(self.changesFile).readlines()
Reilly Grant1d7367d2009-09-10 07:02:38[diff] [blame]2976 changeSet = set()
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]2977 for line in output:
2978 changeSet.add(int(line))
2979
2980 for change in changeSet:
2981 changes.append(change)
2982
2983 changes.sort()
2984 else:
Pete Wyckoff9dcb9f22012-04-09 00:18:01[diff] [blame]2985 # catch "git p4 sync" with no new branches, in a repo that
2986 # does not have any existing p4 branches
Pete Wyckoff5a8e84c2013-01-15 00:47:05[diff] [blame]2987 if len(args) == 0:
2988 if not self.p4BranchesInGit:
2989 die("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here.")
2990
2991 # The default branch is master, unless --branch is used to
2992 # specify something else. Make sure it exists, or complain
2993 # nicely about how to use --branch.
2994 if not self.detectBranches:
2995 if not branch_exists(self.branch):
2996 if branch_arg_given:
2997 die("Error: branch %s does not exist." % self.branch)
2998 else:
2999 die("Error: no branch %s; perhaps specify one with --branch." %
3000 self.branch)
3001
Simon Hausmann29bdbac2007-05-19 08:23:12[diff] [blame]3002 if self.verbose:
Han-Wen Nienhuys86dff6b2007-05-23 21:49:35[diff] [blame]3003 print "Getting p4 changes for %s...%s" % (', '.join(self.depotPaths),
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]3004 self.changeRange)
Simon Hausmann4f6432d2007-08-26 13:56:36[diff] [blame]3005 changes = p4ChangesForPaths(self.depotPaths, self.changeRange)
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]3006
Simon Hausmann01a9c9c2007-05-22 22:07:35[diff] [blame]3007 if len(self.maxChanges) > 0:
Han-Wen Nienhuys7fcff9d2007-07-23 22:56:37[diff] [blame]3008 changes = changes[:min(int(self.maxChanges), len(changes))]
Simon Hausmann01a9c9c2007-05-22 22:07:35[diff] [blame]3009
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]3010 if len(changes) == 0:
Simon Hausmann0828ab12007-03-20 19:59:30[diff] [blame]3011 if not self.silent:
Simon Hausmann341dc1c2007-05-20 22:39:16[diff] [blame]3012 print "No changes to import!"
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]3013 else:
3014 if not self.silent and not self.detectBranches:
3015 print "Import destination: %s" % self.branch
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]3016
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]3017 self.updatedBranches = set()
Simon Hausmanna9d1a272007-06-11 21:28:03[diff] [blame]3018
Pete Wyckoff47497842013-01-15 00:47:04[diff] [blame]3019 if not self.detectBranches:
3020 if args:
3021 # start a new branch
3022 self.initialParent = ""
3023 else:
3024 # build on a previous revision
3025 self.initialParent = parseRevision(self.branch)
3026
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]3027 self.importChanges(changes)
Simon Hausmann341dc1c2007-05-20 22:39:16[diff] [blame]3028
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]3029 if not self.silent:
3030 print ""
3031 if len(self.updatedBranches) > 0:
3032 sys.stdout.write("Updated branches: ")
3033 for b in self.updatedBranches:
3034 sys.stdout.write("%s " % b)
3035 sys.stdout.write("\n")
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]3036
Pete Wyckoff0d609032013-01-27 03:11:24[diff] [blame]3037 if gitConfigBool("git-p4.importLabels"):
Luke Diamand06dcd152012-05-11 06:25:18[diff] [blame]3038 self.importLabels = True
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]3039
3040 if self.importLabels:
3041 p4Labels = getP4Labels(self.depotPaths)
3042 gitTags = getGitTags()
3043
3044 missingP4Labels = p4Labels - gitTags
3045 self.importP4Labels(self.gitStream, missingP4Labels)
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]3046
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]3047 self.gitStream.close()
Pete Wyckoff78189be2012-11-23 22:35:36[diff] [blame]3048 if self.importProcess.wait() != 0:
Simon Hausmann29bdbac2007-05-19 08:23:12[diff] [blame]3049 die("fast-import failed: %s" % self.gitError.read())
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]3050 self.gitOutput.close()
3051 self.gitError.close()
3052
Vitor Antunesfed23692012-01-25 23:48:22[diff] [blame]3053 # Cleanup temporary branches created during import
3054 if self.tempBranches != []:
3055 for branch in self.tempBranches:
3056 read_pipe("git update-ref -d %s" % branch)
3057 os.rmdir(os.path.join(os.environ.get("GIT_DIR", ".git"), self.tempBranchLocation))
3058
Pete Wyckoff55d12432013-01-15 00:46:59[diff] [blame]3059 # Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow
3060 # a convenient shortcut refname "p4".
3061 if self.importIntoRemotes:
3062 head_ref = self.refPrefix + "HEAD"
3063 if not gitBranchExists(head_ref) and gitBranchExists(self.branch):
3064 system(["git", "symbolic-ref", head_ref, self.branch])
3065
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]3066 return True
3067
Simon Hausmann01ce1fe2007-04-07 21:46:50[diff] [blame]3068class P4Rebase(Command):
3069 def __init__(self):
3070 Command.__init__(self)
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]3071 self.options = [
3072 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]3073 ]
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]3074 self.importLabels = False
Han-Wen Nienhuyscebdf5a2007-05-23 19:53:11[diff] [blame]3075 self.description = ("Fetches the latest revision from perforce and "
3076 + "rebases the current work (branch) against it")
Simon Hausmann01ce1fe2007-04-07 21:46:50[diff] [blame]3077
3078 def run(self, args):
3079 sync = P4Sync()
Luke Diamand06804c72012-04-11 15:21:24[diff] [blame]3080 sync.importLabels = self.importLabels
Simon Hausmann01ce1fe2007-04-07 21:46:50[diff] [blame]3081 sync.run([])
Simon Hausmannd7e38682007-06-12 12:34:46[diff] [blame]3082
Simon Hausmann14594f42007-08-22 07:07:15[diff] [blame]3083 return self.rebase()
3084
3085 def rebase(self):
Simon Hausmann36ee4ee2008-01-07 13:21:45[diff] [blame]3086 if os.system("git update-index --refresh") != 0:
3087 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.");
3088 if len(read_pipe("git diff-index HEAD --")) > 0:
Veres Lajosf7e604e2013-06-19 05:37:24[diff] [blame]3089 die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
Simon Hausmann36ee4ee2008-01-07 13:21:45[diff] [blame]3090
Simon Hausmannd7e38682007-06-12 12:34:46[diff] [blame]3091 [upstream, settings] = findUpstreamBranchPoint()
3092 if len(upstream) == 0:
3093 die("Cannot find upstream branchpoint for rebase")
3094
3095 # the branchpoint may be p4/foo~3, so strip off the parent
3096 upstream = re.sub("~[0-9]+$", "", upstream)
3097
3098 print "Rebasing the current branch onto %s" % upstream
Han-Wen Nienhuysb25b2062007-05-23 21:49:35[diff] [blame]3099 oldHead = read_pipe("git rev-parse HEAD").strip()
Simon Hausmannd7e38682007-06-12 12:34:46[diff] [blame]3100 system("git rebase %s" % upstream)
Vlad Dogaru4e49d952014-04-07 13:19:11[diff] [blame]3101 system("git diff-tree --stat --summary -M %s HEAD --" % oldHead)
Simon Hausmann01ce1fe2007-04-07 21:46:50[diff] [blame]3102 return True
3103
Simon Hausmannf9a3a4f2007-04-08 08:08:26[diff] [blame]3104class P4Clone(P4Sync):
3105 def __init__(self):
3106 P4Sync.__init__(self)
3107 self.description = "Creates a new git repository and imports from Perforce into it"
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]3108 self.usage = "usage: %prog [options] //depot/path[@revRange]"
Tommy Thorn354081d2008-02-03 18:38:51[diff] [blame]3109 self.options += [
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]3110 optparse.make_option("--destination", dest="cloneDestination",
3111 action='store', default=None,
Tommy Thorn354081d2008-02-03 18:38:51[diff] [blame]3112 help="where to leave result of the clone"),
Pete Wyckoff38200072011-02-19 13:18:01[diff] [blame]3113 optparse.make_option("--bare", dest="cloneBare",
3114 action="store_true", default=False),
Tommy Thorn354081d2008-02-03 18:38:51[diff] [blame]3115 ]
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]3116 self.cloneDestination = None
Simon Hausmannf9a3a4f2007-04-08 08:08:26[diff] [blame]3117 self.needsGit = False
Pete Wyckoff38200072011-02-19 13:18:01[diff] [blame]3118 self.cloneBare = False
Simon Hausmannf9a3a4f2007-04-08 08:08:26[diff] [blame]3119
Han-Wen Nienhuys6a49f8e2007-05-23 21:49:35[diff] [blame]3120 def defaultDestination(self, args):
3121 ## TODO: use common prefix of args?
3122 depotPath = args[0]
3123 depotDir = re.sub("(@[^@]*)$", "", depotPath)
3124 depotDir = re.sub("(#[^#]*)$", "", depotDir)
Toby Allsopp053d9e42008-02-04 20:41:43[diff] [blame]3125 depotDir = re.sub(r"\.\.\.$", "", depotDir)
Han-Wen Nienhuys6a49f8e2007-05-23 21:49:35[diff] [blame]3126 depotDir = re.sub(r"/$", "", depotDir)
3127 return os.path.split(depotDir)[1]
3128
Simon Hausmannf9a3a4f2007-04-08 08:08:26[diff] [blame]3129 def run(self, args):
3130 if len(args) < 1:
3131 return False
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]3132
3133 if self.keepRepoPath and not self.cloneDestination:
3134 sys.stderr.write("Must specify destination for --keep-path\n")
3135 sys.exit(1)
Simon Hausmannf9a3a4f2007-04-08 08:08:26[diff] [blame]3136
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]3137 depotPaths = args
Simon Hausmann5e100b52007-06-07 19:12:25[diff] [blame]3138
3139 if not self.cloneDestination and len(depotPaths) > 1:
3140 self.cloneDestination = depotPaths[-1]
3141 depotPaths = depotPaths[:-1]
3142
Tommy Thorn354081d2008-02-03 18:38:51[diff] [blame]3143 self.cloneExclude = ["/"+p for p in self.cloneExclude]
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]3144 for p in depotPaths:
3145 if not p.startswith("//"):
Pete Wyckoff0f487d32013-01-27 03:11:06[diff] [blame]3146 sys.stderr.write('Depot paths must start with "//": %s\n' % p)
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]3147 return False
Simon Hausmannf9a3a4f2007-04-08 08:08:26[diff] [blame]3148
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]3149 if not self.cloneDestination:
Marius Storm-Olsen98ad4fa2007-06-07 13:08:33[diff] [blame]3150 self.cloneDestination = self.defaultDestination(args)
Simon Hausmannf9a3a4f2007-04-08 08:08:26[diff] [blame]3151
Han-Wen Nienhuys86dff6b2007-05-23 21:49:35[diff] [blame]3152 print "Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination)
Pete Wyckoff38200072011-02-19 13:18:01[diff] [blame]3153
Kevin Greenc3bf3f12007-06-11 20:48:07[diff] [blame]3154 if not os.path.exists(self.cloneDestination):
3155 os.makedirs(self.cloneDestination)
Robert Blum053fd0c2008-08-01 19:50:03[diff] [blame]3156 chdir(self.cloneDestination)
Pete Wyckoff38200072011-02-19 13:18:01[diff] [blame]3157
3158 init_cmd = [ "git", "init" ]
3159 if self.cloneBare:
3160 init_cmd.append("--bare")
Brandon Caseya235e852013-01-26 19:14:33[diff] [blame]3161 retcode = subprocess.call(init_cmd)
3162 if retcode:
3163 raise CalledProcessError(retcode, init_cmd)
Pete Wyckoff38200072011-02-19 13:18:01[diff] [blame]3164
Han-Wen Nienhuys6326aa52007-05-23 21:49:35[diff] [blame]3165 if not P4Sync.run(self, depotPaths):
Simon Hausmannf9a3a4f2007-04-08 08:08:26[diff] [blame]3166 return False
Pete Wyckoffc5959562013-01-15 00:47:01[diff] [blame]3167
3168 # create a master branch and check out a work tree
3169 if gitBranchExists(self.branch):
3170 system([ "git", "branch", "master", self.branch ])
3171 if not self.cloneBare:
3172 system([ "git", "checkout", "-f" ])
3173 else:
3174 print 'Not checking out any branch, use ' \
3175 '"git checkout -q -b master <branch>"'
Han-Wen Nienhuys86dff6b2007-05-23 21:49:35[diff] [blame]3176
Pete Wyckoffa93d33e2012-02-26 01:06:24[diff] [blame]3177 # auto-set this variable if invoked with --use-client-spec
3178 if self.useClientSpec_from_options:
3179 system("git config --bool git-p4.useclientspec true")
3180
Simon Hausmannf9a3a4f2007-04-08 08:08:26[diff] [blame]3181 return True
3182
Simon Hausmann09d89de2007-06-20 21:10:28[diff] [blame]3183class P4Branches(Command):
3184 def __init__(self):
3185 Command.__init__(self)
3186 self.options = [ ]
3187 self.description = ("Shows the git branches that hold imports and their "
3188 + "corresponding perforce depot paths")
3189 self.verbose = False
3190
3191 def run(self, args):
Simon Hausmann5ca44612007-08-24 15:44:16[diff] [blame]3192 if originP4BranchesExist():
3193 createOrUpdateBranchesFromOrigin()
3194
Simon Hausmann09d89de2007-06-20 21:10:28[diff] [blame]3195 cmdline = "git rev-parse --symbolic "
3196 cmdline += " --remotes"
3197
3198 for line in read_pipe_lines(cmdline):
3199 line = line.strip()
3200
3201 if not line.startswith('p4/') or line == "p4/HEAD":
3202 continue
3203 branch = line
3204
3205 log = extractLogMessageFromGitCommit("refs/remotes/%s" % branch)
3206 settings = extractSettingsGitLog(log)
3207
3208 print "%s <= %s (%s)" % (branch, ",".join(settings["depot-paths"]), settings["change"])
3209 return True
3210
Simon Hausmannb9847332007-03-20 19:54:23[diff] [blame]3211class HelpFormatter(optparse.IndentedHelpFormatter):
3212 def __init__(self):
3213 optparse.IndentedHelpFormatter.__init__(self)
3214
3215 def format_description(self, description):
3216 if description:
3217 return description + "\n"
3218 else:
3219 return ""
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]3220
Simon Hausmann86949ee2007-03-19 19:59:12[diff] [blame]3221def printUsage(commands):
3222 print "usage: %s <command> [options]" % sys.argv[0]
3223 print ""
3224 print "valid commands: %s" % ", ".join(commands)
3225 print ""
3226 print "Try %s <command> --help for command specific help." % sys.argv[0]
3227 print ""
3228
3229commands = {
Han-Wen Nienhuysb86f7372007-05-23 21:49:35[diff] [blame]3230 "debug" : P4Debug,
3231 "submit" : P4Submit,
Marius Storm-Olsena9834f52007-10-09 14:16:09[diff] [blame]3232 "commit" : P4Submit,
Han-Wen Nienhuysb86f7372007-05-23 21:49:35[diff] [blame]3233 "sync" : P4Sync,
3234 "rebase" : P4Rebase,
3235 "clone" : P4Clone,
Simon Hausmann09d89de2007-06-20 21:10:28[diff] [blame]3236 "rollback" : P4RollBack,
3237 "branches" : P4Branches
Simon Hausmann86949ee2007-03-19 19:59:12[diff] [blame]3238}
3239
Simon Hausmann86949ee2007-03-19 19:59:12[diff] [blame]3240
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]3241def main():
3242 if len(sys.argv[1:]) == 0:
3243 printUsage(commands.keys())
3244 sys.exit(2)
Simon Hausmann86949ee2007-03-19 19:59:12[diff] [blame]3245
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]3246 cmdName = sys.argv[1]
3247 try:
Han-Wen Nienhuysb86f7372007-05-23 21:49:35[diff] [blame]3248 klass = commands[cmdName]
3249 cmd = klass()
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]3250 except KeyError:
3251 print "unknown command %s" % cmdName
3252 print ""
3253 printUsage(commands.keys())
3254 sys.exit(2)
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]3255
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]3256 options = cmd.options
Han-Wen Nienhuysb86f7372007-05-23 21:49:35[diff] [blame]3257 cmd.gitdir = os.environ.get("GIT_DIR", None)
Simon Hausmann86949ee2007-03-19 19:59:12[diff] [blame]3258
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]3259 args = sys.argv[2:]
Simon Hausmanne20a9e52007-03-25 22:13:51[diff] [blame]3260
Pete Wyckoffb0ccc802012-09-09 20:16:10[diff] [blame]3261 options.append(optparse.make_option("--verbose", "-v", dest="verbose", action="store_true"))
Luke Diamand6a10b6a2012-04-24 08:33:23[diff] [blame]3262 if cmd.needsGit:
3263 options.append(optparse.make_option("--git-dir", dest="gitdir"))
Simon Hausmanne20a9e52007-03-25 22:13:51[diff] [blame]3264
Luke Diamand6a10b6a2012-04-24 08:33:23[diff] [blame]3265 parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
3266 options,
3267 description = cmd.description,
3268 formatter = HelpFormatter())
Simon Hausmann86949ee2007-03-19 19:59:12[diff] [blame]3269
Luke Diamand6a10b6a2012-04-24 08:33:23[diff] [blame]3270 (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]3271 global verbose
3272 verbose = cmd.verbose
3273 if cmd.needsGit:
Han-Wen Nienhuysb86f7372007-05-23 21:49:35[diff] [blame]3274 if cmd.gitdir == None:
3275 cmd.gitdir = os.path.abspath(".git")
3276 if not isValidGitDir(cmd.gitdir):
3277 cmd.gitdir = read_pipe("git rev-parse --git-dir").strip()
3278 if os.path.exists(cmd.gitdir):
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]3279 cdup = read_pipe("git rev-parse --show-cdup").strip()
3280 if len(cdup) > 0:
Robert Blum053fd0c2008-08-01 19:50:03[diff] [blame]3281 chdir(cdup);
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]3282
Han-Wen Nienhuysb86f7372007-05-23 21:49:35[diff] [blame]3283 if not isValidGitDir(cmd.gitdir):
3284 if isValidGitDir(cmd.gitdir + "/.git"):
3285 cmd.gitdir += "/.git"
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]3286 else:
Han-Wen Nienhuysb86f7372007-05-23 21:49:35[diff] [blame]3287 die("fatal: cannot locate git repository at %s" % cmd.gitdir)
Simon Hausmann8910ac02007-03-26 06:18:55[diff] [blame]3288
Han-Wen Nienhuysb86f7372007-05-23 21:49:35[diff] [blame]3289 os.environ["GIT_DIR"] = cmd.gitdir
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]3290
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]3291 if not cmd.run(args):
3292 parser.print_help()
Pete Wyckoff09fca772011-12-25 02:07:39[diff] [blame]3293 sys.exit(2)
Simon Hausmann4f5cf762007-03-19 21:25:17[diff] [blame]3294
Han-Wen Nienhuysbb6e09b2007-05-23 21:49:35[diff] [blame]3295
3296if __name__ == '__main__':
3297 main()