Merge branch 'ot/ref-filter-object-info'
[git.git] / git-p4.py
blob3e12774f96bb185bb6860290ad187c986ec7fa76
1 #!/usr/bin/env python
3 # git-p4.py -- A tool for bidirectional operation between a Perforce depot and git.
5 # Author: Simon Hausmann <simon@lst.de>
6 # Copyright: 2007 Simon Hausmann <simon@lst.de>
7 # 2007 Trolltech ASA
8 # License: MIT <http://www.opensource.org/licenses/mit-license.php>
10 import sys
11 if 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)
15 import os
16 import optparse
17 import marshal
18 import subprocess
19 import tempfile
20 import time
21 import platform
22 import re
23 import shutil
24 import stat
25 import zipfile
26 import zlib
27 import ctypes
28 import errno
30 # support basestring in python3
31 try:
32 unicode = unicode
33 except NameError:
34 # 'unicode' is undefined, must be Python 3
35 str = str
36 unicode = str
37 bytes = bytes
38 basestring = (str,bytes)
39 else:
40 # 'unicode' exists, must be Python 2
41 str = str
42 unicode = unicode
43 bytes = str
44 basestring = basestring
46 try:
47 from subprocess import CalledProcessError
48 except ImportError:
49 # from python2.7:subprocess.py
50 # Exception classes used by this module.
51 class CalledProcessError(Exception):
52 """This exception is raised when a process run by check_call() returns
53 a non-zero exit status. The exit status will be stored in the
54 returncode attribute."""
55 def __init__(self, returncode, cmd):
56 self.returncode = returncode
57 self.cmd = cmd
58 def __str__(self):
59 return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode)
61 verbose = False
63 # Only labels/tags matching this will be imported/exported
64 defaultLabelRegexp = r'[a-zA-Z0-9_\-.]+$'
66 # The block size is reduced automatically if required
67 defaultBlockSize = 1<<20
69 p4_access_checked = False
71 def p4_build_cmd(cmd):
72 """Build a suitable p4 command line.
74 This consolidates building and returning a p4 command line into one
75 location. It means that hooking into the environment, or other configuration
76 can be done more easily.
77 """
78 real_cmd = ["p4"]
80 user = gitConfig("git-p4.user")
81 if len(user) > 0:
82 real_cmd += ["-u",user]
84 password = gitConfig("git-p4.password")
85 if len(password) > 0:
86 real_cmd += ["-P", password]
88 port = gitConfig("git-p4.port")
89 if len(port) > 0:
90 real_cmd += ["-p", port]
92 host = gitConfig("git-p4.host")
93 if len(host) > 0:
94 real_cmd += ["-H", host]
96 client = gitConfig("git-p4.client")
97 if len(client) > 0:
98 real_cmd += ["-c", client]
100 retries = gitConfigInt("git-p4.retries")
101 if retries is None:
102 # Perform 3 retries by default
103 retries = 3
104 if retries > 0:
105 # Provide a way to not pass this option by setting git-p4.retries to 0
106 real_cmd += ["-r", str(retries)]
108 if isinstance(cmd,basestring):
109 real_cmd = ' '.join(real_cmd) + ' ' + cmd
110 else:
111 real_cmd += cmd
113 # now check that we can actually talk to the server
114 global p4_access_checked
115 if not p4_access_checked:
116 p4_access_checked = True # suppress access checks in p4_check_access itself
117 p4_check_access()
119 return real_cmd
121 def git_dir(path):
122 """ Return TRUE if the given path is a git directory (/path/to/dir/.git).
123 This won't automatically add ".git" to a directory.
125 d = read_pipe(["git", "--git-dir", path, "rev-parse", "--git-dir"], True).strip()
126 if not d or len(d) == 0:
127 return None
128 else:
129 return d
131 def chdir(path, is_client_path=False):
132 """Do chdir to the given path, and set the PWD environment
133 variable for use by P4. It does not look at getcwd() output.
134 Since we're not using the shell, it is necessary to set the
135 PWD environment variable explicitly.
137 Normally, expand the path to force it to be absolute. This
138 addresses the use of relative path names inside P4 settings,
139 e.g. P4CONFIG=.p4config. P4 does not simply open the filename
140 as given; it looks for .p4config using PWD.
142 If is_client_path, the path was handed to us directly by p4,
143 and may be a symbolic link. Do not call os.getcwd() in this
144 case, because it will cause p4 to think that PWD is not inside
145 the client path.
148 os.chdir(path)
149 if not is_client_path:
150 path = os.getcwd()
151 os.environ['PWD'] = path
153 def calcDiskFree():
154 """Return free space in bytes on the disk of the given dirname."""
155 if platform.system() == 'Windows':
156 free_bytes = ctypes.c_ulonglong(0)
157 ctypes.windll.kernel32.GetDiskFreeSpaceExW(ctypes.c_wchar_p(os.getcwd()), None, None, ctypes.pointer(free_bytes))
158 return free_bytes.value
159 else:
160 st = os.statvfs(os.getcwd())
161 return st.f_bavail * st.f_frsize
163 def die(msg):
164 if verbose:
165 raise Exception(msg)
166 else:
167 sys.stderr.write(msg + "\n")
168 sys.exit(1)
170 def write_pipe(c, stdin):
171 if verbose:
172 sys.stderr.write('Writing pipe: %s\n' % str(c))
174 expand = isinstance(c,basestring)
175 p = subprocess.Popen(c, stdin=subprocess.PIPE, shell=expand)
176 pipe = p.stdin
177 val = pipe.write(stdin)
178 pipe.close()
179 if p.wait():
180 die('Command failed: %s' % str(c))
182 return val
184 def p4_write_pipe(c, stdin):
185 real_cmd = p4_build_cmd(c)
186 return write_pipe(real_cmd, stdin)
188 def read_pipe_full(c):
189 """ Read output from command. Returns a tuple
190 of the return status, stdout text and stderr
191 text.
193 if verbose:
194 sys.stderr.write('Reading pipe: %s\n' % str(c))
196 expand = isinstance(c,basestring)
197 p = subprocess.Popen(c, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=expand)
198 (out, err) = p.communicate()
199 return (p.returncode, out, err)
201 def read_pipe(c, ignore_error=False):
202 """ Read output from command. Returns the output text on
203 success. On failure, terminates execution, unless
204 ignore_error is True, when it returns an empty string.
206 (retcode, out, err) = read_pipe_full(c)
207 if retcode != 0:
208 if ignore_error:
209 out = ""
210 else:
211 die('Command failed: %s\nError: %s' % (str(c), err))
212 return out
214 def read_pipe_text(c):
215 """ Read output from a command with trailing whitespace stripped.
216 On error, returns None.
218 (retcode, out, err) = read_pipe_full(c)
219 if retcode != 0:
220 return None
221 else:
222 return out.rstrip()
224 def p4_read_pipe(c, ignore_error=False):
225 real_cmd = p4_build_cmd(c)
226 return read_pipe(real_cmd, ignore_error)
228 def read_pipe_lines(c):
229 if verbose:
230 sys.stderr.write('Reading pipe: %s\n' % str(c))
232 expand = isinstance(c, basestring)
233 p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand)
234 pipe = p.stdout
235 val = pipe.readlines()
236 if pipe.close() or p.wait():
237 die('Command failed: %s' % str(c))
239 return val
241 def p4_read_pipe_lines(c):
242 """Specifically invoke p4 on the command supplied. """
243 real_cmd = p4_build_cmd(c)
244 return read_pipe_lines(real_cmd)
246 def p4_has_command(cmd):
247 """Ask p4 for help on this command. If it returns an error, the
248 command does not exist in this version of p4."""
249 real_cmd = p4_build_cmd(["help", cmd])
250 p = subprocess.Popen(real_cmd, stdout=subprocess.PIPE,
251 stderr=subprocess.PIPE)
252 p.communicate()
253 return p.returncode == 0
255 def p4_has_move_command():
256 """See if the move command exists, that it supports -k, and that
257 it has not been administratively disabled. The arguments
258 must be correct, but the filenames do not have to exist. Use
259 ones with wildcards so even if they exist, it will fail."""
261 if not p4_has_command("move"):
262 return False
263 cmd = p4_build_cmd(["move", "-k", "@from", "@to"])
264 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
265 (out, err) = p.communicate()
266 # return code will be 1 in either case
267 if err.find("Invalid option") >= 0:
268 return False
269 if err.find("disabled") >= 0:
270 return False
271 # assume it failed because @... was invalid changelist
272 return True
274 def system(cmd, ignore_error=False):
275 expand = isinstance(cmd,basestring)
276 if verbose:
277 sys.stderr.write("executing %s\n" % str(cmd))
278 retcode = subprocess.call(cmd, shell=expand)
279 if retcode and not ignore_error:
280 raise CalledProcessError(retcode, cmd)
282 return retcode
284 def p4_system(cmd):
285 """Specifically invoke p4 as the system command. """
286 real_cmd = p4_build_cmd(cmd)
287 expand = isinstance(real_cmd, basestring)
288 retcode = subprocess.call(real_cmd, shell=expand)
289 if retcode:
290 raise CalledProcessError(retcode, real_cmd)
292 def die_bad_access(s):
293 die("failure accessing depot: {0}".format(s.rstrip()))
295 def p4_check_access(min_expiration=1):
296 """ Check if we can access Perforce - account still logged in
298 results = p4CmdList(["login", "-s"])
300 if len(results) == 0:
301 # should never get here: always get either some results, or a p4ExitCode
302 assert("could not parse response from perforce")
304 result = results[0]
306 if 'p4ExitCode' in result:
307 # p4 returned non-zero status, e.g. P4PORT invalid, or p4 not in path
308 die_bad_access("could not run p4")
310 code = result.get("code")
311 if not code:
312 # we get here if we couldn't connect and there was nothing to unmarshal
313 die_bad_access("could not connect")
315 elif code == "stat":
316 expiry = result.get("TicketExpiration")
317 if expiry:
318 expiry = int(expiry)
319 if expiry > min_expiration:
320 # ok to carry on
321 return
322 else:
323 die_bad_access("perforce ticket expires in {0} seconds".format(expiry))
325 else:
326 # account without a timeout - all ok
327 return
329 elif code == "error":
330 data = result.get("data")
331 if data:
332 die_bad_access("p4 error: {0}".format(data))
333 else:
334 die_bad_access("unknown error")
335 elif code == "info":
336 return
337 else:
338 die_bad_access("unknown error code {0}".format(code))
340 _p4_version_string = None
341 def p4_version_string():
342 """Read the version string, showing just the last line, which
343 hopefully is the interesting version bit.
345 $ p4 -V
346 Perforce - The Fast Software Configuration Management System.
347 Copyright 1995-2011 Perforce Software. All rights reserved.
348 Rev. P4/NTX86/2011.1/393975 (2011/12/16).
350 global _p4_version_string
351 if not _p4_version_string:
352 a = p4_read_pipe_lines(["-V"])
353 _p4_version_string = a[-1].rstrip()
354 return _p4_version_string
356 def p4_integrate(src, dest):
357 p4_system(["integrate", "-Dt", wildcard_encode(src), wildcard_encode(dest)])
359 def p4_sync(f, *options):
360 p4_system(["sync"] + list(options) + [wildcard_encode(f)])
362 def p4_add(f):
363 # forcibly add file names with wildcards
364 if wildcard_present(f):
365 p4_system(["add", "-f", f])
366 else:
367 p4_system(["add", f])
369 def p4_delete(f):
370 p4_system(["delete", wildcard_encode(f)])
372 def p4_edit(f, *options):
373 p4_system(["edit"] + list(options) + [wildcard_encode(f)])
375 def p4_revert(f):
376 p4_system(["revert", wildcard_encode(f)])
378 def p4_reopen(type, f):
379 p4_system(["reopen", "-t", type, wildcard_encode(f)])
381 def p4_reopen_in_change(changelist, files):
382 cmd = ["reopen", "-c", str(changelist)] + files
383 p4_system(cmd)
385 def p4_move(src, dest):
386 p4_system(["move", "-k", wildcard_encode(src), wildcard_encode(dest)])
388 def p4_last_change():
389 results = p4CmdList(["changes", "-m", "1"], skip_info=True)
390 return int(results[0]['change'])
392 def p4_describe(change, shelved=False):
393 """Make sure it returns a valid result by checking for
394 the presence of field "time". Return a dict of the
395 results."""
397 cmd = ["describe", "-s"]
398 if shelved:
399 cmd += ["-S"]
400 cmd += [str(change)]
402 ds = p4CmdList(cmd, skip_info=True)
403 if len(ds) != 1:
404 die("p4 describe -s %d did not return 1 result: %s" % (change, str(ds)))
406 d = ds[0]
408 if "p4ExitCode" in d:
409 die("p4 describe -s %d exited with %d: %s" % (change, d["p4ExitCode"],
410 str(d)))
411 if "code" in d:
412 if d["code"] == "error":
413 die("p4 describe -s %d returned error code: %s" % (change, str(d)))
415 if "time" not in d:
416 die("p4 describe -s %d returned no \"time\": %s" % (change, str(d)))
418 return d
421 # Canonicalize the p4 type and return a tuple of the
422 # base type, plus any modifiers. See "p4 help filetypes"
423 # for a list and explanation.
425 def split_p4_type(p4type):
427 p4_filetypes_historical = {
428 "ctempobj": "binary+Sw",
429 "ctext": "text+C",
430 "cxtext": "text+Cx",
431 "ktext": "text+k",
432 "kxtext": "text+kx",
433 "ltext": "text+F",
434 "tempobj": "binary+FSw",
435 "ubinary": "binary+F",
436 "uresource": "resource+F",
437 "uxbinary": "binary+Fx",
438 "xbinary": "binary+x",
439 "xltext": "text+Fx",
440 "xtempobj": "binary+Swx",
441 "xtext": "text+x",
442 "xunicode": "unicode+x",
443 "xutf16": "utf16+x",
445 if p4type in p4_filetypes_historical:
446 p4type = p4_filetypes_historical[p4type]
447 mods = ""
448 s = p4type.split("+")
449 base = s[0]
450 mods = ""
451 if len(s) > 1:
452 mods = s[1]
453 return (base, mods)
456 # return the raw p4 type of a file (text, text+ko, etc)
458 def p4_type(f):
459 results = p4CmdList(["fstat", "-T", "headType", wildcard_encode(f)])
460 return results[0]['headType']
463 # Given a type base and modifier, return a regexp matching
464 # the keywords that can be expanded in the file
466 def p4_keywords_regexp_for_type(base, type_mods):
467 if base in ("text", "unicode", "binary"):
468 kwords = None
469 if "ko" in type_mods:
470 kwords = 'Id|Header'
471 elif "k" in type_mods:
472 kwords = 'Id|Header|Author|Date|DateTime|Change|File|Revision'
473 else:
474 return None
475 pattern = r"""
476 \$ # Starts with a dollar, followed by...
477 (%s) # one of the keywords, followed by...
478 (:[^$\n]+)? # possibly an old expansion, followed by...
479 \$ # another dollar
480 """ % kwords
481 return pattern
482 else:
483 return None
486 # Given a file, return a regexp matching the possible
487 # RCS keywords that will be expanded, or None for files
488 # with kw expansion turned off.
490 def p4_keywords_regexp_for_file(file):
491 if not os.path.exists(file):
492 return None
493 else:
494 (type_base, type_mods) = split_p4_type(p4_type(file))
495 return p4_keywords_regexp_for_type(type_base, type_mods)
497 def setP4ExecBit(file, mode):
498 # Reopens an already open file and changes the execute bit to match
499 # the execute bit setting in the passed in mode.
501 p4Type = "+x"
503 if not isModeExec(mode):
504 p4Type = getP4OpenedType(file)
505 p4Type = re.sub('^([cku]?)x(.*)', '\\1\\2', p4Type)
506 p4Type = re.sub('(.*?\+.*?)x(.*?)', '\\1\\2', p4Type)
507 if p4Type[-1] == "+":
508 p4Type = p4Type[0:-1]
510 p4_reopen(p4Type, file)
512 def getP4OpenedType(file):
513 # Returns the perforce file type for the given file.
515 result = p4_read_pipe(["opened", wildcard_encode(file)])
516 match = re.match(".*\((.+)\)( \*exclusive\*)?\r?$", result)
517 if match:
518 return match.group(1)
519 else:
520 die("Could not determine file type for %s (result: '%s')" % (file, result))
522 # Return the set of all p4 labels
523 def getP4Labels(depotPaths):
524 labels = set()
525 if isinstance(depotPaths,basestring):
526 depotPaths = [depotPaths]
528 for l in p4CmdList(["labels"] + ["%s..." % p for p in depotPaths]):
529 label = l['label']
530 labels.add(label)
532 return labels
534 # Return the set of all git tags
535 def getGitTags():
536 gitTags = set()
537 for line in read_pipe_lines(["git", "tag"]):
538 tag = line.strip()
539 gitTags.add(tag)
540 return gitTags
542 def diffTreePattern():
543 # This is a simple generator for the diff tree regex pattern. This could be
544 # a class variable if this and parseDiffTreeEntry were a part of a class.
545 pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)')
546 while True:
547 yield pattern
549 def parseDiffTreeEntry(entry):
550 """Parses a single diff tree entry into its component elements.
552 See git-diff-tree(1) manpage for details about the format of the diff
553 output. This method returns a dictionary with the following elements:
555 src_mode - The mode of the source file
556 dst_mode - The mode of the destination file
557 src_sha1 - The sha1 for the source file
558 dst_sha1 - The sha1 fr the destination file
559 status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc)
560 status_score - The score for the status (applicable for 'C' and 'R'
561 statuses). This is None if there is no score.
562 src - The path for the source file.
563 dst - The path for the destination file. This is only present for
564 copy or renames. If it is not present, this is None.
566 If the pattern is not matched, None is returned."""
568 match = diffTreePattern().next().match(entry)
569 if match:
570 return {
571 'src_mode': match.group(1),
572 'dst_mode': match.group(2),
573 'src_sha1': match.group(3),
574 'dst_sha1': match.group(4),
575 'status': match.group(5),
576 'status_score': match.group(6),
577 'src': match.group(7),
578 'dst': match.group(10)
580 return None
582 def isModeExec(mode):
583 # Returns True if the given git mode represents an executable file,
584 # otherwise False.
585 return mode[-3:] == "755"
587 class P4Exception(Exception):
588 """ Base class for exceptions from the p4 client """
589 def __init__(self, exit_code):
590 self.p4ExitCode = exit_code
592 class P4ServerException(P4Exception):
593 """ Base class for exceptions where we get some kind of marshalled up result from the server """
594 def __init__(self, exit_code, p4_result):
595 super(P4ServerException, self).__init__(exit_code)
596 self.p4_result = p4_result
597 self.code = p4_result[0]['code']
598 self.data = p4_result[0]['data']
600 class P4RequestSizeException(P4ServerException):
601 """ One of the maxresults or maxscanrows errors """
602 def __init__(self, exit_code, p4_result, limit):
603 super(P4RequestSizeException, self).__init__(exit_code, p4_result)
604 self.limit = limit
606 def isModeExecChanged(src_mode, dst_mode):
607 return isModeExec(src_mode) != isModeExec(dst_mode)
609 def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
610 errors_as_exceptions=False):
612 if isinstance(cmd,basestring):
613 cmd = "-G " + cmd
614 expand = True
615 else:
616 cmd = ["-G"] + cmd
617 expand = False
619 cmd = p4_build_cmd(cmd)
620 if verbose:
621 sys.stderr.write("Opening pipe: %s\n" % str(cmd))
623 # Use a temporary file to avoid deadlocks without
624 # subprocess.communicate(), which would put another copy
625 # of stdout into memory.
626 stdin_file = None
627 if stdin is not None:
628 stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode)
629 if isinstance(stdin,basestring):
630 stdin_file.write(stdin)
631 else:
632 for i in stdin:
633 stdin_file.write(i + '\n')
634 stdin_file.flush()
635 stdin_file.seek(0)
637 p4 = subprocess.Popen(cmd,
638 shell=expand,
639 stdin=stdin_file,
640 stdout=subprocess.PIPE)
642 result = []
643 try:
644 while True:
645 entry = marshal.load(p4.stdout)
646 if skip_info:
647 if 'code' in entry and entry['code'] == 'info':
648 continue
649 if cb is not None:
650 cb(entry)
651 else:
652 result.append(entry)
653 except EOFError:
654 pass
655 exitCode = p4.wait()
656 if exitCode != 0:
657 if errors_as_exceptions:
658 if len(result) > 0:
659 data = result[0].get('data')
660 if data:
661 m = re.search('Too many rows scanned \(over (\d+)\)', data)
662 if not m:
663 m = re.search('Request too large \(over (\d+)\)', data)
665 if m:
666 limit = int(m.group(1))
667 raise P4RequestSizeException(exitCode, result, limit)
669 raise P4ServerException(exitCode, result)
670 else:
671 raise P4Exception(exitCode)
672 else:
673 entry = {}
674 entry["p4ExitCode"] = exitCode
675 result.append(entry)
677 return result
679 def p4Cmd(cmd):
680 list = p4CmdList(cmd)
681 result = {}
682 for entry in list:
683 result.update(entry)
684 return result;
686 def p4Where(depotPath):
687 if not depotPath.endswith("/"):
688 depotPath += "/"
689 depotPathLong = depotPath + "..."
690 outputList = p4CmdList(["where", depotPathLong])
691 output = None
692 for entry in outputList:
693 if "depotFile" in entry:
694 # Search for the base client side depot path, as long as it starts with the branch's P4 path.
695 # The base path always ends with "/...".
696 if entry["depotFile"].find(depotPath) == 0 and entry["depotFile"][-4:] == "/...":
697 output = entry
698 break
699 elif "data" in entry:
700 data = entry.get("data")
701 space = data.find(" ")
702 if data[:space] == depotPath:
703 output = entry
704 break
705 if output == None:
706 return ""
707 if output["code"] == "error":
708 return ""
709 clientPath = ""
710 if "path" in output:
711 clientPath = output.get("path")
712 elif "data" in output:
713 data = output.get("data")
714 lastSpace = data.rfind(" ")
715 clientPath = data[lastSpace + 1:]
717 if clientPath.endswith("..."):
718 clientPath = clientPath[:-3]
719 return clientPath
721 def currentGitBranch():
722 return read_pipe_text(["git", "symbolic-ref", "--short", "-q", "HEAD"])
724 def isValidGitDir(path):
725 return git_dir(path) != None
727 def parseRevision(ref):
728 return read_pipe("git rev-parse %s" % ref).strip()
730 def branchExists(ref):
731 rev = read_pipe(["git", "rev-parse", "-q", "--verify", ref],
732 ignore_error=True)
733 return len(rev) > 0
735 def extractLogMessageFromGitCommit(commit):
736 logMessage = ""
738 ## fixme: title is first line of commit, not 1st paragraph.
739 foundTitle = False
740 for log in read_pipe_lines("git cat-file commit %s" % commit):
741 if not foundTitle:
742 if len(log) == 1:
743 foundTitle = True
744 continue
746 logMessage += log
747 return logMessage
749 def extractSettingsGitLog(log):
750 values = {}
751 for line in log.split("\n"):
752 line = line.strip()
753 m = re.search (r"^ *\[git-p4: (.*)\]$", line)
754 if not m:
755 continue
757 assignments = m.group(1).split (':')
758 for a in assignments:
759 vals = a.split ('=')
760 key = vals[0].strip()
761 val = ('='.join (vals[1:])).strip()
762 if val.endswith ('\"') and val.startswith('"'):
763 val = val[1:-1]
765 values[key] = val
767 paths = values.get("depot-paths")
768 if not paths:
769 paths = values.get("depot-path")
770 if paths:
771 values['depot-paths'] = paths.split(',')
772 return values
774 def gitBranchExists(branch):
775 proc = subprocess.Popen(["git", "rev-parse", branch],
776 stderr=subprocess.PIPE, stdout=subprocess.PIPE);
777 return proc.wait() == 0;
779 def gitUpdateRef(ref, newvalue):
780 subprocess.check_call(["git", "update-ref", ref, newvalue])
782 def gitDeleteRef(ref):
783 subprocess.check_call(["git", "update-ref", "-d", ref])
785 _gitConfig = {}
787 def gitConfig(key, typeSpecifier=None):
788 if key not in _gitConfig:
789 cmd = [ "git", "config" ]
790 if typeSpecifier:
791 cmd += [ typeSpecifier ]
792 cmd += [ key ]
793 s = read_pipe(cmd, ignore_error=True)
794 _gitConfig[key] = s.strip()
795 return _gitConfig[key]
797 def gitConfigBool(key):
798 """Return a bool, using git config --bool. It is True only if the
799 variable is set to true, and False if set to false or not present
800 in the config."""
802 if key not in _gitConfig:
803 _gitConfig[key] = gitConfig(key, '--bool') == "true"
804 return _gitConfig[key]
806 def gitConfigInt(key):
807 if key not in _gitConfig:
808 cmd = [ "git", "config", "--int", key ]
809 s = read_pipe(cmd, ignore_error=True)
810 v = s.strip()
811 try:
812 _gitConfig[key] = int(gitConfig(key, '--int'))
813 except ValueError:
814 _gitConfig[key] = None
815 return _gitConfig[key]
817 def gitConfigList(key):
818 if key not in _gitConfig:
819 s = read_pipe(["git", "config", "--get-all", key], ignore_error=True)
820 _gitConfig[key] = s.strip().splitlines()
821 if _gitConfig[key] == ['']:
822 _gitConfig[key] = []
823 return _gitConfig[key]
825 def p4BranchesInGit(branchesAreInRemotes=True):
826 """Find all the branches whose names start with "p4/", looking
827 in remotes or heads as specified by the argument. Return
828 a dictionary of { branch: revision } for each one found.
829 The branch names are the short names, without any
830 "p4/" prefix."""
832 branches = {}
834 cmdline = "git rev-parse --symbolic "
835 if branchesAreInRemotes:
836 cmdline += "--remotes"
837 else:
838 cmdline += "--branches"
840 for line in read_pipe_lines(cmdline):
841 line = line.strip()
843 # only import to p4/
844 if not line.startswith('p4/'):
845 continue
846 # special symbolic ref to p4/master
847 if line == "p4/HEAD":
848 continue
850 # strip off p4/ prefix
851 branch = line[len("p4/"):]
853 branches[branch] = parseRevision(line)
855 return branches
857 def branch_exists(branch):
858 """Make sure that the given ref name really exists."""
860 cmd = [ "git", "rev-parse", "--symbolic", "--verify", branch ]
861 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
862 out, _ = p.communicate()
863 if p.returncode:
864 return False
865 # expect exactly one line of output: the branch name
866 return out.rstrip() == branch
868 def findUpstreamBranchPoint(head = "HEAD"):
869 branches = p4BranchesInGit()
870 # map from depot-path to branch name
871 branchByDepotPath = {}
872 for branch in branches.keys():
873 tip = branches[branch]
874 log = extractLogMessageFromGitCommit(tip)
875 settings = extractSettingsGitLog(log)
876 if "depot-paths" in settings:
877 paths = ",".join(settings["depot-paths"])
878 branchByDepotPath[paths] = "remotes/p4/" + branch
880 settings = None
881 parent = 0
882 while parent < 65535:
883 commit = head + "~%s" % parent
884 log = extractLogMessageFromGitCommit(commit)
885 settings = extractSettingsGitLog(log)
886 if "depot-paths" in settings:
887 paths = ",".join(settings["depot-paths"])
888 if paths in branchByDepotPath:
889 return [branchByDepotPath[paths], settings]
891 parent = parent + 1
893 return ["", settings]
895 def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent=True):
896 if not silent:
897 print("Creating/updating branch(es) in %s based on origin branch(es)"
898 % localRefPrefix)
900 originPrefix = "origin/p4/"
902 for line in read_pipe_lines("git rev-parse --symbolic --remotes"):
903 line = line.strip()
904 if (not line.startswith(originPrefix)) or line.endswith("HEAD"):
905 continue
907 headName = line[len(originPrefix):]
908 remoteHead = localRefPrefix + headName
909 originHead = line
911 original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead))
912 if ('depot-paths' not in original
913 or 'change' not in original):
914 continue
916 update = False
917 if not gitBranchExists(remoteHead):
918 if verbose:
919 print("creating %s" % remoteHead)
920 update = True
921 else:
922 settings = extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead))
923 if 'change' in settings:
924 if settings['depot-paths'] == original['depot-paths']:
925 originP4Change = int(original['change'])
926 p4Change = int(settings['change'])
927 if originP4Change > p4Change:
928 print("%s (%s) is newer than %s (%s). "
929 "Updating p4 branch from origin."
930 % (originHead, originP4Change,
931 remoteHead, p4Change))
932 update = True
933 else:
934 print("Ignoring: %s was imported from %s while "
935 "%s was imported from %s"
936 % (originHead, ','.join(original['depot-paths']),
937 remoteHead, ','.join(settings['depot-paths'])))
939 if update:
940 system("git update-ref %s %s" % (remoteHead, originHead))
942 def originP4BranchesExist():
943 return gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
946 def p4ParseNumericChangeRange(parts):
947 changeStart = int(parts[0][1:])
948 if parts[1] == '#head':
949 changeEnd = p4_last_change()
950 else:
951 changeEnd = int(parts[1])
953 return (changeStart, changeEnd)
955 def chooseBlockSize(blockSize):
956 if blockSize:
957 return blockSize
958 else:
959 return defaultBlockSize
961 def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
962 assert depotPaths
964 # Parse the change range into start and end. Try to find integer
965 # revision ranges as these can be broken up into blocks to avoid
966 # hitting server-side limits (maxrows, maxscanresults). But if
967 # that doesn't work, fall back to using the raw revision specifier
968 # strings, without using block mode.
970 if changeRange is None or changeRange == '':
971 changeStart = 1
972 changeEnd = p4_last_change()
973 block_size = chooseBlockSize(requestedBlockSize)
974 else:
975 parts = changeRange.split(',')
976 assert len(parts) == 2
977 try:
978 (changeStart, changeEnd) = p4ParseNumericChangeRange(parts)
979 block_size = chooseBlockSize(requestedBlockSize)
980 except ValueError:
981 changeStart = parts[0][1:]
982 changeEnd = parts[1]
983 if requestedBlockSize:
984 die("cannot use --changes-block-size with non-numeric revisions")
985 block_size = None
987 changes = set()
989 # Retrieve changes a block at a time, to prevent running
990 # into a MaxResults/MaxScanRows error from the server. If
991 # we _do_ hit one of those errors, turn down the block size
993 while True:
994 cmd = ['changes']
996 if block_size:
997 end = min(changeEnd, changeStart + block_size)
998 revisionRange = "%d,%d" % (changeStart, end)
999 else:
1000 revisionRange = "%s,%s" % (changeStart, changeEnd)
1002 for p in depotPaths:
1003 cmd += ["%s...@%s" % (p, revisionRange)]
1005 # fetch the changes
1006 try:
1007 result = p4CmdList(cmd, errors_as_exceptions=True)
1008 except P4RequestSizeException as e:
1009 if not block_size:
1010 block_size = e.limit
1011 elif block_size > e.limit:
1012 block_size = e.limit
1013 else:
1014 block_size = max(2, block_size // 2)
1016 if verbose: print("block size error, retrying with block size {0}".format(block_size))
1017 continue
1018 except P4Exception as e:
1019 die('Error retrieving changes description ({0})'.format(e.p4ExitCode))
1021 # Insert changes in chronological order
1022 for entry in reversed(result):
1023 if 'change' not in entry:
1024 continue
1025 changes.add(int(entry['change']))
1027 if not block_size:
1028 break
1030 if end >= changeEnd:
1031 break
1033 changeStart = end + 1
1035 changes = sorted(changes)
1036 return changes
1038 def p4PathStartsWith(path, prefix):
1039 # This method tries to remedy a potential mixed-case issue:
1041 # If UserA adds //depot/DirA/file1
1042 # and UserB adds //depot/dira/file2
1044 # we may or may not have a problem. If you have core.ignorecase=true,
1045 # we treat DirA and dira as the same directory
1046 if gitConfigBool("core.ignorecase"):
1047 return path.lower().startswith(prefix.lower())
1048 return path.startswith(prefix)
1050 def getClientSpec():
1051 """Look at the p4 client spec, create a View() object that contains
1052 all the mappings, and return it."""
1054 specList = p4CmdList("client -o")
1055 if len(specList) != 1:
1056 die('Output from "client -o" is %d lines, expecting 1' %
1057 len(specList))
1059 # dictionary of all client parameters
1060 entry = specList[0]
1062 # the //client/ name
1063 client_name = entry["Client"]
1065 # just the keys that start with "View"
1066 view_keys = [ k for k in entry.keys() if k.startswith("View") ]
1068 # hold this new View
1069 view = View(client_name)
1071 # append the lines, in order, to the view
1072 for view_num in range(len(view_keys)):
1073 k = "View%d" % view_num
1074 if k not in view_keys:
1075 die("Expected view key %s missing" % k)
1076 view.append(entry[k])
1078 return view
1080 def getClientRoot():
1081 """Grab the client directory."""
1083 output = p4CmdList("client -o")
1084 if len(output) != 1:
1085 die('Output from "client -o" is %d lines, expecting 1' % len(output))
1087 entry = output[0]
1088 if "Root" not in entry:
1089 die('Client has no "Root"')
1091 return entry["Root"]
1094 # P4 wildcards are not allowed in filenames. P4 complains
1095 # if you simply add them, but you can force it with "-f", in
1096 # which case it translates them into %xx encoding internally.
1098 def wildcard_decode(path):
1099 # Search for and fix just these four characters. Do % last so
1100 # that fixing it does not inadvertently create new %-escapes.
1101 # Cannot have * in a filename in windows; untested as to
1102 # what p4 would do in such a case.
1103 if not platform.system() == "Windows":
1104 path = path.replace("%2A", "*")
1105 path = path.replace("%23", "#") \
1106 .replace("%40", "@") \
1107 .replace("%25", "%")
1108 return path
1110 def wildcard_encode(path):
1111 # do % first to avoid double-encoding the %s introduced here
1112 path = path.replace("%", "%25") \
1113 .replace("*", "%2A") \
1114 .replace("#", "%23") \
1115 .replace("@", "%40")
1116 return path
1118 def wildcard_present(path):
1119 m = re.search("[*#@%]", path)
1120 return m is not None
1122 class LargeFileSystem(object):
1123 """Base class for large file system support."""
1125 def __init__(self, writeToGitStream):
1126 self.largeFiles = set()
1127 self.writeToGitStream = writeToGitStream
1129 def generatePointer(self, cloneDestination, contentFile):
1130 """Return the content of a pointer file that is stored in Git instead of
1131 the actual content."""
1132 assert False, "Method 'generatePointer' required in " + self.__class__.__name__
1134 def pushFile(self, localLargeFile):
1135 """Push the actual content which is not stored in the Git repository to
1136 a server."""
1137 assert False, "Method 'pushFile' required in " + self.__class__.__name__
1139 def hasLargeFileExtension(self, relPath):
1140 return reduce(
1141 lambda a, b: a or b,
1142 [relPath.endswith('.' + e) for e in gitConfigList('git-p4.largeFileExtensions')],
1143 False
1146 def generateTempFile(self, contents):
1147 contentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=False)
1148 for d in contents:
1149 contentFile.write(d)
1150 contentFile.close()
1151 return contentFile.name
1153 def exceedsLargeFileThreshold(self, relPath, contents):
1154 if gitConfigInt('git-p4.largeFileThreshold'):
1155 contentsSize = sum(len(d) for d in contents)
1156 if contentsSize > gitConfigInt('git-p4.largeFileThreshold'):
1157 return True
1158 if gitConfigInt('git-p4.largeFileCompressedThreshold'):
1159 contentsSize = sum(len(d) for d in contents)
1160 if contentsSize <= gitConfigInt('git-p4.largeFileCompressedThreshold'):
1161 return False
1162 contentTempFile = self.generateTempFile(contents)
1163 compressedContentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=False)
1164 zf = zipfile.ZipFile(compressedContentFile.name, mode='w')
1165 zf.write(contentTempFile, compress_type=zipfile.ZIP_DEFLATED)
1166 zf.close()
1167 compressedContentsSize = zf.infolist()[0].compress_size
1168 os.remove(contentTempFile)
1169 os.remove(compressedContentFile.name)
1170 if compressedContentsSize > gitConfigInt('git-p4.largeFileCompressedThreshold'):
1171 return True
1172 return False
1174 def addLargeFile(self, relPath):
1175 self.largeFiles.add(relPath)
1177 def removeLargeFile(self, relPath):
1178 self.largeFiles.remove(relPath)
1180 def isLargeFile(self, relPath):
1181 return relPath in self.largeFiles
1183 def processContent(self, git_mode, relPath, contents):
1184 """Processes the content of git fast import. This method decides if a
1185 file is stored in the large file system and handles all necessary
1186 steps."""
1187 if self.exceedsLargeFileThreshold(relPath, contents) or self.hasLargeFileExtension(relPath):
1188 contentTempFile = self.generateTempFile(contents)
1189 (pointer_git_mode, contents, localLargeFile) = self.generatePointer(contentTempFile)
1190 if pointer_git_mode:
1191 git_mode = pointer_git_mode
1192 if localLargeFile:
1193 # Move temp file to final location in large file system
1194 largeFileDir = os.path.dirname(localLargeFile)
1195 if not os.path.isdir(largeFileDir):
1196 os.makedirs(largeFileDir)
1197 shutil.move(contentTempFile, localLargeFile)
1198 self.addLargeFile(relPath)
1199 if gitConfigBool('git-p4.largeFilePush'):
1200 self.pushFile(localLargeFile)
1201 if verbose:
1202 sys.stderr.write("%s moved to large file system (%s)\n" % (relPath, localLargeFile))
1203 return (git_mode, contents)
1205 class MockLFS(LargeFileSystem):
1206 """Mock large file system for testing."""
1208 def generatePointer(self, contentFile):
1209 """The pointer content is the original content prefixed with "pointer-".
1210 The local filename of the large file storage is derived from the file content.
1212 with open(contentFile, 'r') as f:
1213 content = next(f)
1214 gitMode = '100644'
1215 pointerContents = 'pointer-' + content
1216 localLargeFile = os.path.join(os.getcwd(), '.git', 'mock-storage', 'local', content[:-1])
1217 return (gitMode, pointerContents, localLargeFile)
1219 def pushFile(self, localLargeFile):
1220 """The remote filename of the large file storage is the same as the local
1221 one but in a different directory.
1223 remotePath = os.path.join(os.path.dirname(localLargeFile), '..', 'remote')
1224 if not os.path.exists(remotePath):
1225 os.makedirs(remotePath)
1226 shutil.copyfile(localLargeFile, os.path.join(remotePath, os.path.basename(localLargeFile)))
1228 class GitLFS(LargeFileSystem):
1229 """Git LFS as backend for the git-p4 large file system.
1230 See https://git-lfs.github.com/ for details."""
1232 def __init__(self, *args):
1233 LargeFileSystem.__init__(self, *args)
1234 self.baseGitAttributes = []
1236 def generatePointer(self, contentFile):
1237 """Generate a Git LFS pointer for the content. Return LFS Pointer file
1238 mode and content which is stored in the Git repository instead of
1239 the actual content. Return also the new location of the actual
1240 content.
1242 if os.path.getsize(contentFile) == 0:
1243 return (None, '', None)
1245 pointerProcess = subprocess.Popen(
1246 ['git', 'lfs', 'pointer', '--file=' + contentFile],
1247 stdout=subprocess.PIPE
1249 pointerFile = pointerProcess.stdout.read()
1250 if pointerProcess.wait():
1251 os.remove(contentFile)
1252 die('git-lfs pointer command failed. Did you install the extension?')
1254 # Git LFS removed the preamble in the output of the 'pointer' command
1255 # starting from version 1.2.0. Check for the preamble here to support
1256 # earlier versions.
1257 # c.f. https://github.com/github/git-lfs/commit/da2935d9a739592bc775c98d8ef4df9c72ea3b43
1258 if pointerFile.startswith('Git LFS pointer for'):
1259 pointerFile = re.sub(r'Git LFS pointer for.*\n\n', '', pointerFile)
1261 oid = re.search(r'^oid \w+:(\w+)', pointerFile, re.MULTILINE).group(1)
1262 localLargeFile = os.path.join(
1263 os.getcwd(),
1264 '.git', 'lfs', 'objects', oid[:2], oid[2:4],
1265 oid,
1267 # LFS Spec states that pointer files should not have the executable bit set.
1268 gitMode = '100644'
1269 return (gitMode, pointerFile, localLargeFile)
1271 def pushFile(self, localLargeFile):
1272 uploadProcess = subprocess.Popen(
1273 ['git', 'lfs', 'push', '--object-id', 'origin', os.path.basename(localLargeFile)]
1275 if uploadProcess.wait():
1276 die('git-lfs push command failed. Did you define a remote?')
1278 def generateGitAttributes(self):
1279 return (
1280 self.baseGitAttributes +
1282 '\n',
1283 '#\n',
1284 '# Git LFS (see https://git-lfs.github.com/)\n',
1285 '#\n',
1287 ['*.' + f.replace(' ', '[[:space:]]') + ' filter=lfs diff=lfs merge=lfs -text\n'
1288 for f in sorted(gitConfigList('git-p4.largeFileExtensions'))
1290 ['/' + f.replace(' ', '[[:space:]]') + ' filter=lfs diff=lfs merge=lfs -text\n'
1291 for f in sorted(self.largeFiles) if not self.hasLargeFileExtension(f)
1295 def addLargeFile(self, relPath):
1296 LargeFileSystem.addLargeFile(self, relPath)
1297 self.writeToGitStream('100644', '.gitattributes', self.generateGitAttributes())
1299 def removeLargeFile(self, relPath):
1300 LargeFileSystem.removeLargeFile(self, relPath)
1301 self.writeToGitStream('100644', '.gitattributes', self.generateGitAttributes())
1303 def processContent(self, git_mode, relPath, contents):
1304 if relPath == '.gitattributes':
1305 self.baseGitAttributes = contents
1306 return (git_mode, self.generateGitAttributes())
1307 else:
1308 return LargeFileSystem.processContent(self, git_mode, relPath, contents)
1310 class Command:
1311 delete_actions = ( "delete", "move/delete", "purge" )
1312 add_actions = ( "add", "move/add" )
1314 def __init__(self):
1315 self.usage = "usage: %prog [options]"
1316 self.needsGit = True
1317 self.verbose = False
1319 # This is required for the "append" cloneExclude action
1320 def ensure_value(self, attr, value):
1321 if not hasattr(self, attr) or getattr(self, attr) is None:
1322 setattr(self, attr, value)
1323 return getattr(self, attr)
1325 class P4UserMap:
1326 def __init__(self):
1327 self.userMapFromPerforceServer = False
1328 self.myP4UserId = None
1330 def p4UserId(self):
1331 if self.myP4UserId:
1332 return self.myP4UserId
1334 results = p4CmdList("user -o")
1335 for r in results:
1336 if 'User' in r:
1337 self.myP4UserId = r['User']
1338 return r['User']
1339 die("Could not find your p4 user id")
1341 def p4UserIsMe(self, p4User):
1342 # return True if the given p4 user is actually me
1343 me = self.p4UserId()
1344 if not p4User or p4User != me:
1345 return False
1346 else:
1347 return True
1349 def getUserCacheFilename(self):
1350 home = os.environ.get("HOME", os.environ.get("USERPROFILE"))
1351 return home + "/.gitp4-usercache.txt"
1353 def getUserMapFromPerforceServer(self):
1354 if self.userMapFromPerforceServer:
1355 return
1356 self.users = {}
1357 self.emails = {}
1359 for output in p4CmdList("users"):
1360 if "User" not in output:
1361 continue
1362 self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
1363 self.emails[output["Email"]] = output["User"]
1365 mapUserConfigRegex = re.compile(r"^\s*(\S+)\s*=\s*(.+)\s*<(\S+)>\s*$", re.VERBOSE)
1366 for mapUserConfig in gitConfigList("git-p4.mapUser"):
1367 mapUser = mapUserConfigRegex.findall(mapUserConfig)
1368 if mapUser and len(mapUser[0]) == 3:
1369 user = mapUser[0][0]
1370 fullname = mapUser[0][1]
1371 email = mapUser[0][2]
1372 self.users[user] = fullname + " <" + email + ">"
1373 self.emails[email] = user
1375 s = ''
1376 for (key, val) in self.users.items():
1377 s += "%s\t%s\n" % (key.expandtabs(1), val.expandtabs(1))
1379 open(self.getUserCacheFilename(), "wb").write(s)
1380 self.userMapFromPerforceServer = True
1382 def loadUserMapFromCache(self):
1383 self.users = {}
1384 self.userMapFromPerforceServer = False
1385 try:
1386 cache = open(self.getUserCacheFilename(), "rb")
1387 lines = cache.readlines()
1388 cache.close()
1389 for line in lines:
1390 entry = line.strip().split("\t")
1391 self.users[entry[0]] = entry[1]
1392 except IOError:
1393 self.getUserMapFromPerforceServer()
1395 class P4Debug(Command):
1396 def __init__(self):
1397 Command.__init__(self)
1398 self.options = []
1399 self.description = "A tool to debug the output of p4 -G."
1400 self.needsGit = False
1402 def run(self, args):
1403 j = 0
1404 for output in p4CmdList(args):
1405 print('Element: %d' % j)
1406 j += 1
1407 print(output)
1408 return True
1410 class P4RollBack(Command):
1411 def __init__(self):
1412 Command.__init__(self)
1413 self.options = [
1414 optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true")
1416 self.description = "A tool to debug the multi-branch import. Don't use :)"
1417 self.rollbackLocalBranches = False
1419 def run(self, args):
1420 if len(args) != 1:
1421 return False
1422 maxChange = int(args[0])
1424 if "p4ExitCode" in p4Cmd("changes -m 1"):
1425 die("Problems executing p4");
1427 if self.rollbackLocalBranches:
1428 refPrefix = "refs/heads/"
1429 lines = read_pipe_lines("git rev-parse --symbolic --branches")
1430 else:
1431 refPrefix = "refs/remotes/"
1432 lines = read_pipe_lines("git rev-parse --symbolic --remotes")
1434 for line in lines:
1435 if self.rollbackLocalBranches or (line.startswith("p4/") and line != "p4/HEAD\n"):
1436 line = line.strip()
1437 ref = refPrefix + line
1438 log = extractLogMessageFromGitCommit(ref)
1439 settings = extractSettingsGitLog(log)
1441 depotPaths = settings['depot-paths']
1442 change = settings['change']
1444 changed = False
1446 if len(p4Cmd("changes -m 1 " + ' '.join (['%s...@%s' % (p, maxChange)
1447 for p in depotPaths]))) == 0:
1448 print("Branch %s did not exist at change %s, deleting." % (ref, maxChange))
1449 system("git update-ref -d %s `git rev-parse %s`" % (ref, ref))
1450 continue
1452 while change and int(change) > maxChange:
1453 changed = True
1454 if self.verbose:
1455 print("%s is at %s ; rewinding towards %s" % (ref, change, maxChange))
1456 system("git update-ref %s \"%s^\"" % (ref, ref))
1457 log = extractLogMessageFromGitCommit(ref)
1458 settings = extractSettingsGitLog(log)
1461 depotPaths = settings['depot-paths']
1462 change = settings['change']
1464 if changed:
1465 print("%s rewound to %s" % (ref, change))
1467 return True
1469 class P4Submit(Command, P4UserMap):
1471 conflict_behavior_choices = ("ask", "skip", "quit")
1473 def __init__(self):
1474 Command.__init__(self)
1475 P4UserMap.__init__(self)
1476 self.options = [
1477 optparse.make_option("--origin", dest="origin"),
1478 optparse.make_option("-M", dest="detectRenames", action="store_true"),
1479 # preserve the user, requires relevant p4 permissions
1480 optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"),
1481 optparse.make_option("--export-labels", dest="exportLabels", action="store_true"),
1482 optparse.make_option("--dry-run", "-n", dest="dry_run", action="store_true"),
1483 optparse.make_option("--prepare-p4-only", dest="prepare_p4_only", action="store_true"),
1484 optparse.make_option("--conflict", dest="conflict_behavior",
1485 choices=self.conflict_behavior_choices),
1486 optparse.make_option("--branch", dest="branch"),
1487 optparse.make_option("--shelve", dest="shelve", action="store_true",
1488 help="Shelve instead of submit. Shelved files are reverted, "
1489 "restoring the workspace to the state before the shelve"),
1490 optparse.make_option("--update-shelve", dest="update_shelve", action="append", type="int",
1491 metavar="CHANGELIST",
1492 help="update an existing shelved changelist, implies --shelve, "
1493 "repeat in-order for multiple shelved changelists"),
1494 optparse.make_option("--commit", dest="commit", metavar="COMMIT",
1495 help="submit only the specified commit(s), one commit or xxx..xxx"),
1496 optparse.make_option("--disable-rebase", dest="disable_rebase", action="store_true",
1497 help="Disable rebase after submit is completed. Can be useful if you "
1498 "work from a local git branch that is not master"),
1499 optparse.make_option("--disable-p4sync", dest="disable_p4sync", action="store_true",
1500 help="Skip Perforce sync of p4/master after submit or shelve"),
1502 self.description = """Submit changes from git to the perforce depot.\n
1503 The `p4-pre-submit` hook is executed if it exists and is executable.
1504 The hook takes no parameters and nothing from standard input. Exiting with
1505 non-zero status from this script prevents `git-p4 submit` from launching.
1507 One usage scenario is to run unit tests in the hook."""
1509 self.usage += " [name of git branch to submit into perforce depot]"
1510 self.origin = ""
1511 self.detectRenames = False
1512 self.preserveUser = gitConfigBool("git-p4.preserveUser")
1513 self.dry_run = False
1514 self.shelve = False
1515 self.update_shelve = list()
1516 self.commit = ""
1517 self.disable_rebase = gitConfigBool("git-p4.disableRebase")
1518 self.disable_p4sync = gitConfigBool("git-p4.disableP4Sync")
1519 self.prepare_p4_only = False
1520 self.conflict_behavior = None
1521 self.isWindows = (platform.system() == "Windows")
1522 self.exportLabels = False
1523 self.p4HasMoveCommand = p4_has_move_command()
1524 self.branch = None
1526 if gitConfig('git-p4.largeFileSystem'):
1527 die("Large file system not supported for git-p4 submit command. Please remove it from config.")
1529 def check(self):
1530 if len(p4CmdList("opened ...")) > 0:
1531 die("You have files opened with perforce! Close them before starting the sync.")
1533 def separate_jobs_from_description(self, message):
1534 """Extract and return a possible Jobs field in the commit
1535 message. It goes into a separate section in the p4 change
1536 specification.
1538 A jobs line starts with "Jobs:" and looks like a new field
1539 in a form. Values are white-space separated on the same
1540 line or on following lines that start with a tab.
1542 This does not parse and extract the full git commit message
1543 like a p4 form. It just sees the Jobs: line as a marker
1544 to pass everything from then on directly into the p4 form,
1545 but outside the description section.
1547 Return a tuple (stripped log message, jobs string)."""
1549 m = re.search(r'^Jobs:', message, re.MULTILINE)
1550 if m is None:
1551 return (message, None)
1553 jobtext = message[m.start():]
1554 stripped_message = message[:m.start()].rstrip()
1555 return (stripped_message, jobtext)
1557 def prepareLogMessage(self, template, message, jobs):
1558 """Edits the template returned from "p4 change -o" to insert
1559 the message in the Description field, and the jobs text in
1560 the Jobs field."""
1561 result = ""
1563 inDescriptionSection = False
1565 for line in template.split("\n"):
1566 if line.startswith("#"):
1567 result += line + "\n"
1568 continue
1570 if inDescriptionSection:
1571 if line.startswith("Files:") or line.startswith("Jobs:"):
1572 inDescriptionSection = False
1573 # insert Jobs section
1574 if jobs:
1575 result += jobs + "\n"
1576 else:
1577 continue
1578 else:
1579 if line.startswith("Description:"):
1580 inDescriptionSection = True
1581 line += "\n"
1582 for messageLine in message.split("\n"):
1583 line += "\t" + messageLine + "\n"
1585 result += line + "\n"
1587 return result
1589 def patchRCSKeywords(self, file, pattern):
1590 # Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern
1591 (handle, outFileName) = tempfile.mkstemp(dir='.')
1592 try:
1593 outFile = os.fdopen(handle, "w+")
1594 inFile = open(file, "r")
1595 regexp = re.compile(pattern, re.VERBOSE)
1596 for line in inFile.readlines():
1597 line = regexp.sub(r'$\1$', line)
1598 outFile.write(line)
1599 inFile.close()
1600 outFile.close()
1601 # Forcibly overwrite the original file
1602 os.unlink(file)
1603 shutil.move(outFileName, file)
1604 except:
1605 # cleanup our temporary file
1606 os.unlink(outFileName)
1607 print("Failed to strip RCS keywords in %s" % file)
1608 raise
1610 print("Patched up RCS keywords in %s" % file)
1612 def p4UserForCommit(self,id):
1613 # Return the tuple (perforce user,git email) for a given git commit id
1614 self.getUserMapFromPerforceServer()
1615 gitEmail = read_pipe(["git", "log", "--max-count=1",
1616 "--format=%ae", id])
1617 gitEmail = gitEmail.strip()
1618 if gitEmail not in self.emails:
1619 return (None,gitEmail)
1620 else:
1621 return (self.emails[gitEmail],gitEmail)
1623 def checkValidP4Users(self,commits):
1624 # check if any git authors cannot be mapped to p4 users
1625 for id in commits:
1626 (user,email) = self.p4UserForCommit(id)
1627 if not user:
1628 msg = "Cannot find p4 user for email %s in commit %s." % (email, id)
1629 if gitConfigBool("git-p4.allowMissingP4Users"):
1630 print("%s" % msg)
1631 else:
1632 die("Error: %s\nSet git-p4.allowMissingP4Users to true to allow this." % msg)
1634 def lastP4Changelist(self):
1635 # Get back the last changelist number submitted in this client spec. This
1636 # then gets used to patch up the username in the change. If the same
1637 # client spec is being used by multiple processes then this might go
1638 # wrong.
1639 results = p4CmdList("client -o") # find the current client
1640 client = None
1641 for r in results:
1642 if 'Client' in r:
1643 client = r['Client']
1644 break
1645 if not client:
1646 die("could not get client spec")
1647 results = p4CmdList(["changes", "-c", client, "-m", "1"])
1648 for r in results:
1649 if 'change' in r:
1650 return r['change']
1651 die("Could not get changelist number for last submit - cannot patch up user details")
1653 def modifyChangelistUser(self, changelist, newUser):
1654 # fixup the user field of a changelist after it has been submitted.
1655 changes = p4CmdList("change -o %s" % changelist)
1656 if len(changes) != 1:
1657 die("Bad output from p4 change modifying %s to user %s" %
1658 (changelist, newUser))
1660 c = changes[0]
1661 if c['User'] == newUser: return # nothing to do
1662 c['User'] = newUser
1663 input = marshal.dumps(c)
1665 result = p4CmdList("change -f -i", stdin=input)
1666 for r in result:
1667 if 'code' in r:
1668 if r['code'] == 'error':
1669 die("Could not modify user field of changelist %s to %s:%s" % (changelist, newUser, r['data']))
1670 if 'data' in r:
1671 print("Updated user field for changelist %s to %s" % (changelist, newUser))
1672 return
1673 die("Could not modify user field of changelist %s to %s" % (changelist, newUser))
1675 def canChangeChangelists(self):
1676 # check to see if we have p4 admin or super-user permissions, either of
1677 # which are required to modify changelists.
1678 results = p4CmdList(["protects", self.depotPath])
1679 for r in results:
1680 if 'perm' in r:
1681 if r['perm'] == 'admin':
1682 return 1
1683 if r['perm'] == 'super':
1684 return 1
1685 return 0
1687 def prepareSubmitTemplate(self, changelist=None):
1688 """Run "p4 change -o" to grab a change specification template.
1689 This does not use "p4 -G", as it is nice to keep the submission
1690 template in original order, since a human might edit it.
1692 Remove lines in the Files section that show changes to files
1693 outside the depot path we're committing into."""
1695 [upstream, settings] = findUpstreamBranchPoint()
1697 template = """\
1698 # A Perforce Change Specification.
1700 # Change: The change number. 'new' on a new changelist.
1701 # Date: The date this specification was last modified.
1702 # Client: The client on which the changelist was created. Read-only.
1703 # User: The user who created the changelist.
1704 # Status: Either 'pending' or 'submitted'. Read-only.
1705 # Type: Either 'public' or 'restricted'. Default is 'public'.
1706 # Description: Comments about the changelist. Required.
1707 # Jobs: What opened jobs are to be closed by this changelist.
1708 # You may delete jobs from this list. (New changelists only.)
1709 # Files: What opened files from the default changelist are to be added
1710 # to this changelist. You may delete files from this list.
1711 # (New changelists only.)
1713 files_list = []
1714 inFilesSection = False
1715 change_entry = None
1716 args = ['change', '-o']
1717 if changelist:
1718 args.append(str(changelist))
1719 for entry in p4CmdList(args):
1720 if 'code' not in entry:
1721 continue
1722 if entry['code'] == 'stat':
1723 change_entry = entry
1724 break
1725 if not change_entry:
1726 die('Failed to decode output of p4 change -o')
1727 for key, value in change_entry.iteritems():
1728 if key.startswith('File'):
1729 if 'depot-paths' in settings:
1730 if not [p for p in settings['depot-paths']
1731 if p4PathStartsWith(value, p)]:
1732 continue
1733 else:
1734 if not p4PathStartsWith(value, self.depotPath):
1735 continue
1736 files_list.append(value)
1737 continue
1738 # Output in the order expected by prepareLogMessage
1739 for key in ['Change', 'Client', 'User', 'Status', 'Description', 'Jobs']:
1740 if key not in change_entry:
1741 continue
1742 template += '\n'
1743 template += key + ':'
1744 if key == 'Description':
1745 template += '\n'
1746 for field_line in change_entry[key].splitlines():
1747 template += '\t'+field_line+'\n'
1748 if len(files_list) > 0:
1749 template += '\n'
1750 template += 'Files:\n'
1751 for path in files_list:
1752 template += '\t'+path+'\n'
1753 return template
1755 def edit_template(self, template_file):
1756 """Invoke the editor to let the user change the submission
1757 message. Return true if okay to continue with the submit."""
1759 # if configured to skip the editing part, just submit
1760 if gitConfigBool("git-p4.skipSubmitEdit"):
1761 return True
1763 # look at the modification time, to check later if the user saved
1764 # the file
1765 mtime = os.stat(template_file).st_mtime
1767 # invoke the editor
1768 if "P4EDITOR" in os.environ and (os.environ.get("P4EDITOR") != ""):
1769 editor = os.environ.get("P4EDITOR")
1770 else:
1771 editor = read_pipe("git var GIT_EDITOR").strip()
1772 system(["sh", "-c", ('%s "$@"' % editor), editor, template_file])
1774 # If the file was not saved, prompt to see if this patch should
1775 # be skipped. But skip this verification step if configured so.
1776 if gitConfigBool("git-p4.skipSubmitEditCheck"):
1777 return True
1779 # modification time updated means user saved the file
1780 if os.stat(template_file).st_mtime > mtime:
1781 return True
1783 while True:
1784 response = raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")
1785 if response == 'y':
1786 return True
1787 if response == 'n':
1788 return False
1790 def get_diff_description(self, editedFiles, filesToAdd, symlinks):
1791 # diff
1792 if "P4DIFF" in os.environ:
1793 del(os.environ["P4DIFF"])
1794 diff = ""
1795 for editedFile in editedFiles:
1796 diff += p4_read_pipe(['diff', '-du',
1797 wildcard_encode(editedFile)])
1799 # new file diff
1800 newdiff = ""
1801 for newFile in filesToAdd:
1802 newdiff += "==== new file ====\n"
1803 newdiff += "--- /dev/null\n"
1804 newdiff += "+++ %s\n" % newFile
1806 is_link = os.path.islink(newFile)
1807 expect_link = newFile in symlinks
1809 if is_link and expect_link:
1810 newdiff += "+%s\n" % os.readlink(newFile)
1811 else:
1812 f = open(newFile, "r")
1813 for line in f.readlines():
1814 newdiff += "+" + line
1815 f.close()
1817 return (diff + newdiff).replace('\r\n', '\n')
1819 def applyCommit(self, id):
1820 """Apply one commit, return True if it succeeded."""
1822 print("Applying", read_pipe(["git", "show", "-s",
1823 "--format=format:%h %s", id]))
1825 (p4User, gitEmail) = self.p4UserForCommit(id)
1827 diff = read_pipe_lines("git diff-tree -r %s \"%s^\" \"%s\"" % (self.diffOpts, id, id))
1828 filesToAdd = set()
1829 filesToChangeType = set()
1830 filesToDelete = set()
1831 editedFiles = set()
1832 pureRenameCopy = set()
1833 symlinks = set()
1834 filesToChangeExecBit = {}
1835 all_files = list()
1837 for line in diff:
1838 diff = parseDiffTreeEntry(line)
1839 modifier = diff['status']
1840 path = diff['src']
1841 all_files.append(path)
1843 if modifier == "M":
1844 p4_edit(path)
1845 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
1846 filesToChangeExecBit[path] = diff['dst_mode']
1847 editedFiles.add(path)
1848 elif modifier == "A":
1849 filesToAdd.add(path)
1850 filesToChangeExecBit[path] = diff['dst_mode']
1851 if path in filesToDelete:
1852 filesToDelete.remove(path)
1854 dst_mode = int(diff['dst_mode'], 8)
1855 if dst_mode == 0o120000:
1856 symlinks.add(path)
1858 elif modifier == "D":
1859 filesToDelete.add(path)
1860 if path in filesToAdd:
1861 filesToAdd.remove(path)
1862 elif modifier == "C":
1863 src, dest = diff['src'], diff['dst']
1864 p4_integrate(src, dest)
1865 pureRenameCopy.add(dest)
1866 if diff['src_sha1'] != diff['dst_sha1']:
1867 p4_edit(dest)
1868 pureRenameCopy.discard(dest)
1869 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
1870 p4_edit(dest)
1871 pureRenameCopy.discard(dest)
1872 filesToChangeExecBit[dest] = diff['dst_mode']
1873 if self.isWindows:
1874 # turn off read-only attribute
1875 os.chmod(dest, stat.S_IWRITE)
1876 os.unlink(dest)
1877 editedFiles.add(dest)
1878 elif modifier == "R":
1879 src, dest = diff['src'], diff['dst']
1880 if self.p4HasMoveCommand:
1881 p4_edit(src) # src must be open before move
1882 p4_move(src, dest) # opens for (move/delete, move/add)
1883 else:
1884 p4_integrate(src, dest)
1885 if diff['src_sha1'] != diff['dst_sha1']:
1886 p4_edit(dest)
1887 else:
1888 pureRenameCopy.add(dest)
1889 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
1890 if not self.p4HasMoveCommand:
1891 p4_edit(dest) # with move: already open, writable
1892 filesToChangeExecBit[dest] = diff['dst_mode']
1893 if not self.p4HasMoveCommand:
1894 if self.isWindows:
1895 os.chmod(dest, stat.S_IWRITE)
1896 os.unlink(dest)
1897 filesToDelete.add(src)
1898 editedFiles.add(dest)
1899 elif modifier == "T":
1900 filesToChangeType.add(path)
1901 else:
1902 die("unknown modifier %s for %s" % (modifier, path))
1904 diffcmd = "git diff-tree --full-index -p \"%s\"" % (id)
1905 patchcmd = diffcmd + " | git apply "
1906 tryPatchCmd = patchcmd + "--check -"
1907 applyPatchCmd = patchcmd + "--check --apply -"
1908 patch_succeeded = True
1910 if os.system(tryPatchCmd) != 0:
1911 fixed_rcs_keywords = False
1912 patch_succeeded = False
1913 print("Unfortunately applying the change failed!")
1915 # Patch failed, maybe it's just RCS keyword woes. Look through
1916 # the patch to see if that's possible.
1917 if gitConfigBool("git-p4.attemptRCSCleanup"):
1918 file = None
1919 pattern = None
1920 kwfiles = {}
1921 for file in editedFiles | filesToDelete:
1922 # did this file's delta contain RCS keywords?
1923 pattern = p4_keywords_regexp_for_file(file)
1925 if pattern:
1926 # this file is a possibility...look for RCS keywords.
1927 regexp = re.compile(pattern, re.VERBOSE)
1928 for line in read_pipe_lines(["git", "diff", "%s^..%s" % (id, id), file]):
1929 if regexp.search(line):
1930 if verbose:
1931 print("got keyword match on %s in %s in %s" % (pattern, line, file))
1932 kwfiles[file] = pattern
1933 break
1935 for file in kwfiles:
1936 if verbose:
1937 print("zapping %s with %s" % (line,pattern))
1938 # File is being deleted, so not open in p4. Must
1939 # disable the read-only bit on windows.
1940 if self.isWindows and file not in editedFiles:
1941 os.chmod(file, stat.S_IWRITE)
1942 self.patchRCSKeywords(file, kwfiles[file])
1943 fixed_rcs_keywords = True
1945 if fixed_rcs_keywords:
1946 print("Retrying the patch with RCS keywords cleaned up")
1947 if os.system(tryPatchCmd) == 0:
1948 patch_succeeded = True
1950 if not patch_succeeded:
1951 for f in editedFiles:
1952 p4_revert(f)
1953 return False
1956 # Apply the patch for real, and do add/delete/+x handling.
1958 system(applyPatchCmd)
1960 for f in filesToChangeType:
1961 p4_edit(f, "-t", "auto")
1962 for f in filesToAdd:
1963 p4_add(f)
1964 for f in filesToDelete:
1965 p4_revert(f)
1966 p4_delete(f)
1968 # Set/clear executable bits
1969 for f in filesToChangeExecBit.keys():
1970 mode = filesToChangeExecBit[f]
1971 setP4ExecBit(f, mode)
1973 update_shelve = 0
1974 if len(self.update_shelve) > 0:
1975 update_shelve = self.update_shelve.pop(0)
1976 p4_reopen_in_change(update_shelve, all_files)
1979 # Build p4 change description, starting with the contents
1980 # of the git commit message.
1982 logMessage = extractLogMessageFromGitCommit(id)
1983 logMessage = logMessage.strip()
1984 (logMessage, jobs) = self.separate_jobs_from_description(logMessage)
1986 template = self.prepareSubmitTemplate(update_shelve)
1987 submitTemplate = self.prepareLogMessage(template, logMessage, jobs)
1989 if self.preserveUser:
1990 submitTemplate += "\n######## Actual user %s, modified after commit\n" % p4User
1992 if self.checkAuthorship and not self.p4UserIsMe(p4User):
1993 submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail
1994 submitTemplate += "######## Use option --preserve-user to modify authorship.\n"
1995 submitTemplate += "######## Variable git-p4.skipUserNameCheck hides this message.\n"
1997 separatorLine = "######## everything below this line is just the diff #######\n"
1998 if not self.prepare_p4_only:
1999 submitTemplate += separatorLine
2000 submitTemplate += self.get_diff_description(editedFiles, filesToAdd, symlinks)
2002 (handle, fileName) = tempfile.mkstemp()
2003 tmpFile = os.fdopen(handle, "w+b")
2004 if self.isWindows:
2005 submitTemplate = submitTemplate.replace("\n", "\r\n")
2006 tmpFile.write(submitTemplate)
2007 tmpFile.close()
2009 if self.prepare_p4_only:
2011 # Leave the p4 tree prepared, and the submit template around
2012 # and let the user decide what to do next
2014 print()
2015 print("P4 workspace prepared for submission.")
2016 print("To submit or revert, go to client workspace")
2017 print(" " + self.clientPath)
2018 print()
2019 print("To submit, use \"p4 submit\" to write a new description,")
2020 print("or \"p4 submit -i <%s\" to use the one prepared by" \
2021 " \"git p4\"." % fileName)
2022 print("You can delete the file \"%s\" when finished." % fileName)
2024 if self.preserveUser and p4User and not self.p4UserIsMe(p4User):
2025 print("To preserve change ownership by user %s, you must\n" \
2026 "do \"p4 change -f <change>\" after submitting and\n" \
2027 "edit the User field.")
2028 if pureRenameCopy:
2029 print("After submitting, renamed files must be re-synced.")
2030 print("Invoke \"p4 sync -f\" on each of these files:")
2031 for f in pureRenameCopy:
2032 print(" " + f)
2034 print()
2035 print("To revert the changes, use \"p4 revert ...\", and delete")
2036 print("the submit template file \"%s\"" % fileName)
2037 if filesToAdd:
2038 print("Since the commit adds new files, they must be deleted:")
2039 for f in filesToAdd:
2040 print(" " + f)
2041 print()
2042 return True
2045 # Let the user edit the change description, then submit it.
2047 submitted = False
2049 try:
2050 if self.edit_template(fileName):
2051 # read the edited message and submit
2052 tmpFile = open(fileName, "rb")
2053 message = tmpFile.read()
2054 tmpFile.close()
2055 if self.isWindows:
2056 message = message.replace("\r\n", "\n")
2057 submitTemplate = message[:message.index(separatorLine)]
2059 if update_shelve:
2060 p4_write_pipe(['shelve', '-r', '-i'], submitTemplate)
2061 elif self.shelve:
2062 p4_write_pipe(['shelve', '-i'], submitTemplate)
2063 else:
2064 p4_write_pipe(['submit', '-i'], submitTemplate)
2065 # The rename/copy happened by applying a patch that created a
2066 # new file. This leaves it writable, which confuses p4.
2067 for f in pureRenameCopy:
2068 p4_sync(f, "-f")
2070 if self.preserveUser:
2071 if p4User:
2072 # Get last changelist number. Cannot easily get it from
2073 # the submit command output as the output is
2074 # unmarshalled.
2075 changelist = self.lastP4Changelist()
2076 self.modifyChangelistUser(changelist, p4User)
2078 submitted = True
2080 finally:
2081 # skip this patch
2082 if not submitted or self.shelve:
2083 if self.shelve:
2084 print ("Reverting shelved files.")
2085 else:
2086 print ("Submission cancelled, undoing p4 changes.")
2087 for f in editedFiles | filesToDelete:
2088 p4_revert(f)
2089 for f in filesToAdd:
2090 p4_revert(f)
2091 os.remove(f)
2093 os.remove(fileName)
2094 return submitted
2096 # Export git tags as p4 labels. Create a p4 label and then tag
2097 # with that.
2098 def exportGitTags(self, gitTags):
2099 validLabelRegexp = gitConfig("git-p4.labelExportRegexp")
2100 if len(validLabelRegexp) == 0:
2101 validLabelRegexp = defaultLabelRegexp
2102 m = re.compile(validLabelRegexp)
2104 for name in gitTags:
2106 if not m.match(name):
2107 if verbose:
2108 print("tag %s does not match regexp %s" % (name, validLabelRegexp))
2109 continue
2111 # Get the p4 commit this corresponds to
2112 logMessage = extractLogMessageFromGitCommit(name)
2113 values = extractSettingsGitLog(logMessage)
2115 if 'change' not in values:
2116 # a tag pointing to something not sent to p4; ignore
2117 if verbose:
2118 print("git tag %s does not give a p4 commit" % name)
2119 continue
2120 else:
2121 changelist = values['change']
2123 # Get the tag details.
2124 inHeader = True
2125 isAnnotated = False
2126 body = []
2127 for l in read_pipe_lines(["git", "cat-file", "-p", name]):
2128 l = l.strip()
2129 if inHeader:
2130 if re.match(r'tag\s+', l):
2131 isAnnotated = True
2132 elif re.match(r'\s*$', l):
2133 inHeader = False
2134 continue
2135 else:
2136 body.append(l)
2138 if not isAnnotated:
2139 body = ["lightweight tag imported by git p4\n"]
2141 # Create the label - use the same view as the client spec we are using
2142 clientSpec = getClientSpec()
2144 labelTemplate = "Label: %s\n" % name
2145 labelTemplate += "Description:\n"
2146 for b in body:
2147 labelTemplate += "\t" + b + "\n"
2148 labelTemplate += "View:\n"
2149 for depot_side in clientSpec.mappings:
2150 labelTemplate += "\t%s\n" % depot_side
2152 if self.dry_run:
2153 print("Would create p4 label %s for tag" % name)
2154 elif self.prepare_p4_only:
2155 print("Not creating p4 label %s for tag due to option" \
2156 " --prepare-p4-only" % name)
2157 else:
2158 p4_write_pipe(["label", "-i"], labelTemplate)
2160 # Use the label
2161 p4_system(["tag", "-l", name] +
2162 ["%s@%s" % (depot_side, changelist) for depot_side in clientSpec.mappings])
2164 if verbose:
2165 print("created p4 label for tag %s" % name)
2167 def run(self, args):
2168 if len(args) == 0:
2169 self.master = currentGitBranch()
2170 elif len(args) == 1:
2171 self.master = args[0]
2172 if not branchExists(self.master):
2173 die("Branch %s does not exist" % self.master)
2174 else:
2175 return False
2177 for i in self.update_shelve:
2178 if i <= 0:
2179 sys.exit("invalid changelist %d" % i)
2181 if self.master:
2182 allowSubmit = gitConfig("git-p4.allowSubmit")
2183 if len(allowSubmit) > 0 and not self.master in allowSubmit.split(","):
2184 die("%s is not in git-p4.allowSubmit" % self.master)
2186 [upstream, settings] = findUpstreamBranchPoint()
2187 self.depotPath = settings['depot-paths'][0]
2188 if len(self.origin) == 0:
2189 self.origin = upstream
2191 if len(self.update_shelve) > 0:
2192 self.shelve = True
2194 if self.preserveUser:
2195 if not self.canChangeChangelists():
2196 die("Cannot preserve user names without p4 super-user or admin permissions")
2198 # if not set from the command line, try the config file
2199 if self.conflict_behavior is None:
2200 val = gitConfig("git-p4.conflict")
2201 if val:
2202 if val not in self.conflict_behavior_choices:
2203 die("Invalid value '%s' for config git-p4.conflict" % val)
2204 else:
2205 val = "ask"
2206 self.conflict_behavior = val
2208 if self.verbose:
2209 print("Origin branch is " + self.origin)
2211 if len(self.depotPath) == 0:
2212 print("Internal error: cannot locate perforce depot path from existing branches")
2213 sys.exit(128)
2215 self.useClientSpec = False
2216 if gitConfigBool("git-p4.useclientspec"):
2217 self.useClientSpec = True
2218 if self.useClientSpec:
2219 self.clientSpecDirs = getClientSpec()
2221 # Check for the existence of P4 branches
2222 branchesDetected = (len(p4BranchesInGit().keys()) > 1)
2224 if self.useClientSpec and not branchesDetected:
2225 # all files are relative to the client spec
2226 self.clientPath = getClientRoot()
2227 else:
2228 self.clientPath = p4Where(self.depotPath)
2230 if self.clientPath == "":
2231 die("Error: Cannot locate perforce checkout of %s in client view" % self.depotPath)
2233 print("Perforce checkout for depot path %s located at %s" % (self.depotPath, self.clientPath))
2234 self.oldWorkingDirectory = os.getcwd()
2236 # ensure the clientPath exists
2237 new_client_dir = False
2238 if not os.path.exists(self.clientPath):
2239 new_client_dir = True
2240 os.makedirs(self.clientPath)
2242 chdir(self.clientPath, is_client_path=True)
2243 if self.dry_run:
2244 print("Would synchronize p4 checkout in %s" % self.clientPath)
2245 else:
2246 print("Synchronizing p4 checkout...")
2247 if new_client_dir:
2248 # old one was destroyed, and maybe nobody told p4
2249 p4_sync("...", "-f")
2250 else:
2251 p4_sync("...")
2252 self.check()
2254 commits = []
2255 if self.master:
2256 committish = self.master
2257 else:
2258 committish = 'HEAD'
2260 if self.commit != "":
2261 if self.commit.find("..") != -1:
2262 limits_ish = self.commit.split("..")
2263 for line in read_pipe_lines(["git", "rev-list", "--no-merges", "%s..%s" % (limits_ish[0], limits_ish[1])]):
2264 commits.append(line.strip())
2265 commits.reverse()
2266 else:
2267 commits.append(self.commit)
2268 else:
2269 for line in read_pipe_lines(["git", "rev-list", "--no-merges", "%s..%s" % (self.origin, committish)]):
2270 commits.append(line.strip())
2271 commits.reverse()
2273 if self.preserveUser or gitConfigBool("git-p4.skipUserNameCheck"):
2274 self.checkAuthorship = False
2275 else:
2276 self.checkAuthorship = True
2278 if self.preserveUser:
2279 self.checkValidP4Users(commits)
2282 # Build up a set of options to be passed to diff when
2283 # submitting each commit to p4.
2285 if self.detectRenames:
2286 # command-line -M arg
2287 self.diffOpts = "-M"
2288 else:
2289 # If not explicitly set check the config variable
2290 detectRenames = gitConfig("git-p4.detectRenames")
2292 if detectRenames.lower() == "false" or detectRenames == "":
2293 self.diffOpts = ""
2294 elif detectRenames.lower() == "true":
2295 self.diffOpts = "-M"
2296 else:
2297 self.diffOpts = "-M%s" % detectRenames
2299 # no command-line arg for -C or --find-copies-harder, just
2300 # config variables
2301 detectCopies = gitConfig("git-p4.detectCopies")
2302 if detectCopies.lower() == "false" or detectCopies == "":
2303 pass
2304 elif detectCopies.lower() == "true":
2305 self.diffOpts += " -C"
2306 else:
2307 self.diffOpts += " -C%s" % detectCopies
2309 if gitConfigBool("git-p4.detectCopiesHarder"):
2310 self.diffOpts += " --find-copies-harder"
2312 num_shelves = len(self.update_shelve)
2313 if num_shelves > 0 and num_shelves != len(commits):
2314 sys.exit("number of commits (%d) must match number of shelved changelist (%d)" %
2315 (len(commits), num_shelves))
2317 hooks_path = gitConfig("core.hooksPath")
2318 if len(hooks_path) <= 0:
2319 hooks_path = os.path.join(os.environ.get("GIT_DIR", ".git"), "hooks")
2321 hook_file = os.path.join(hooks_path, "p4-pre-submit")
2322 if os.path.isfile(hook_file) and os.access(hook_file, os.X_OK) and subprocess.call([hook_file]) != 0:
2323 sys.exit(1)
2326 # Apply the commits, one at a time. On failure, ask if should
2327 # continue to try the rest of the patches, or quit.
2329 if self.dry_run:
2330 print("Would apply")
2331 applied = []
2332 last = len(commits) - 1
2333 for i, commit in enumerate(commits):
2334 if self.dry_run:
2335 print(" ", read_pipe(["git", "show", "-s",
2336 "--format=format:%h %s", commit]))
2337 ok = True
2338 else:
2339 ok = self.applyCommit(commit)
2340 if ok:
2341 applied.append(commit)
2342 else:
2343 if self.prepare_p4_only and i < last:
2344 print("Processing only the first commit due to option" \
2345 " --prepare-p4-only")
2346 break
2347 if i < last:
2348 quit = False
2349 while True:
2350 # prompt for what to do, or use the option/variable
2351 if self.conflict_behavior == "ask":
2352 print("What do you want to do?")
2353 response = raw_input("[s]kip this commit but apply"
2354 " the rest, or [q]uit? ")
2355 if not response:
2356 continue
2357 elif self.conflict_behavior == "skip":
2358 response = "s"
2359 elif self.conflict_behavior == "quit":
2360 response = "q"
2361 else:
2362 die("Unknown conflict_behavior '%s'" %
2363 self.conflict_behavior)
2365 if response[0] == "s":
2366 print("Skipping this commit, but applying the rest")
2367 break
2368 if response[0] == "q":
2369 print("Quitting")
2370 quit = True
2371 break
2372 if quit:
2373 break
2375 chdir(self.oldWorkingDirectory)
2376 shelved_applied = "shelved" if self.shelve else "applied"
2377 if self.dry_run:
2378 pass
2379 elif self.prepare_p4_only:
2380 pass
2381 elif len(commits) == len(applied):
2382 print("All commits {0}!".format(shelved_applied))
2384 sync = P4Sync()
2385 if self.branch:
2386 sync.branch = self.branch
2387 if self.disable_p4sync:
2388 sync.sync_origin_only()
2389 else:
2390 sync.run([])
2392 if not self.disable_rebase:
2393 rebase = P4Rebase()
2394 rebase.rebase()
2396 else:
2397 if len(applied) == 0:
2398 print("No commits {0}.".format(shelved_applied))
2399 else:
2400 print("{0} only the commits marked with '*':".format(shelved_applied.capitalize()))
2401 for c in commits:
2402 if c in applied:
2403 star = "*"
2404 else:
2405 star = " "
2406 print(star, read_pipe(["git", "show", "-s",
2407 "--format=format:%h %s", c]))
2408 print("You will have to do 'git p4 sync' and rebase.")
2410 if gitConfigBool("git-p4.exportLabels"):
2411 self.exportLabels = True
2413 if self.exportLabels:
2414 p4Labels = getP4Labels(self.depotPath)
2415 gitTags = getGitTags()
2417 missingGitTags = gitTags - p4Labels
2418 self.exportGitTags(missingGitTags)
2420 # exit with error unless everything applied perfectly
2421 if len(commits) != len(applied):
2422 sys.exit(1)
2424 return True
2426 class View(object):
2427 """Represent a p4 view ("p4 help views"), and map files in a
2428 repo according to the view."""
2430 def __init__(self, client_name):
2431 self.mappings = []
2432 self.client_prefix = "//%s/" % client_name
2433 # cache results of "p4 where" to lookup client file locations
2434 self.client_spec_path_cache = {}
2436 def append(self, view_line):
2437 """Parse a view line, splitting it into depot and client
2438 sides. Append to self.mappings, preserving order. This
2439 is only needed for tag creation."""
2441 # Split the view line into exactly two words. P4 enforces
2442 # structure on these lines that simplifies this quite a bit.
2444 # Either or both words may be double-quoted.
2445 # Single quotes do not matter.
2446 # Double-quote marks cannot occur inside the words.
2447 # A + or - prefix is also inside the quotes.
2448 # There are no quotes unless they contain a space.
2449 # The line is already white-space stripped.
2450 # The two words are separated by a single space.
2452 if view_line[0] == '"':
2453 # First word is double quoted. Find its end.
2454 close_quote_index = view_line.find('"', 1)
2455 if close_quote_index <= 0:
2456 die("No first-word closing quote found: %s" % view_line)
2457 depot_side = view_line[1:close_quote_index]
2458 # skip closing quote and space
2459 rhs_index = close_quote_index + 1 + 1
2460 else:
2461 space_index = view_line.find(" ")
2462 if space_index <= 0:
2463 die("No word-splitting space found: %s" % view_line)
2464 depot_side = view_line[0:space_index]
2465 rhs_index = space_index + 1
2467 # prefix + means overlay on previous mapping
2468 if depot_side.startswith("+"):
2469 depot_side = depot_side[1:]
2471 # prefix - means exclude this path, leave out of mappings
2472 exclude = False
2473 if depot_side.startswith("-"):
2474 exclude = True
2475 depot_side = depot_side[1:]
2477 if not exclude:
2478 self.mappings.append(depot_side)
2480 def convert_client_path(self, clientFile):
2481 # chop off //client/ part to make it relative
2482 if not clientFile.startswith(self.client_prefix):
2483 die("No prefix '%s' on clientFile '%s'" %
2484 (self.client_prefix, clientFile))
2485 return clientFile[len(self.client_prefix):]
2487 def update_client_spec_path_cache(self, files):
2488 """ Caching file paths by "p4 where" batch query """
2490 # List depot file paths exclude that already cached
2491 fileArgs = [f['path'] for f in files if f['path'] not in self.client_spec_path_cache]
2493 if len(fileArgs) == 0:
2494 return # All files in cache
2496 where_result = p4CmdList(["-x", "-", "where"], stdin=fileArgs)
2497 for res in where_result:
2498 if "code" in res and res["code"] == "error":
2499 # assume error is "... file(s) not in client view"
2500 continue
2501 if "clientFile" not in res:
2502 die("No clientFile in 'p4 where' output")
2503 if "unmap" in res:
2504 # it will list all of them, but only one not unmap-ped
2505 continue
2506 if gitConfigBool("core.ignorecase"):
2507 res['depotFile'] = res['depotFile'].lower()
2508 self.client_spec_path_cache[res['depotFile']] = self.convert_client_path(res["clientFile"])
2510 # not found files or unmap files set to ""
2511 for depotFile in fileArgs:
2512 if gitConfigBool("core.ignorecase"):
2513 depotFile = depotFile.lower()
2514 if depotFile not in self.client_spec_path_cache:
2515 self.client_spec_path_cache[depotFile] = ""
2517 def map_in_client(self, depot_path):
2518 """Return the relative location in the client where this
2519 depot file should live. Returns "" if the file should
2520 not be mapped in the client."""
2522 if gitConfigBool("core.ignorecase"):
2523 depot_path = depot_path.lower()
2525 if depot_path in self.client_spec_path_cache:
2526 return self.client_spec_path_cache[depot_path]
2528 die( "Error: %s is not found in client spec path" % depot_path )
2529 return ""
2531 class P4Sync(Command, P4UserMap):
2533 def __init__(self):
2534 Command.__init__(self)
2535 P4UserMap.__init__(self)
2536 self.options = [
2537 optparse.make_option("--branch", dest="branch"),
2538 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),
2539 optparse.make_option("--changesfile", dest="changesFile"),
2540 optparse.make_option("--silent", dest="silent", action="store_true"),
2541 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),
2542 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),
2543 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",
2544 help="Import into refs/heads/ , not refs/remotes"),
2545 optparse.make_option("--max-changes", dest="maxChanges",
2546 help="Maximum number of changes to import"),
2547 optparse.make_option("--changes-block-size", dest="changes_block_size", type="int",
2548 help="Internal block size to use when iteratively calling p4 changes"),
2549 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',
2550 help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),
2551 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',
2552 help="Only sync files that are included in the Perforce Client Spec"),
2553 optparse.make_option("-/", dest="cloneExclude",
2554 action="append", type="string",
2555 help="exclude depot path"),
2557 self.description = """Imports from Perforce into a git repository.\n
2558 example:
2559 //depot/my/project/ -- to import the current head
2560 //depot/my/project/@all -- to import everything
2561 //depot/my/project/@1,6 -- to import only from revision 1 to 6
2563 (a ... is not needed in the path p4 specification, it's added implicitly)"""
2565 self.usage += " //depot/path[@revRange]"
2566 self.silent = False
2567 self.createdBranches = set()
2568 self.committedChanges = set()
2569 self.branch = ""
2570 self.detectBranches = False
2571 self.detectLabels = False
2572 self.importLabels = False
2573 self.changesFile = ""
2574 self.syncWithOrigin = True
2575 self.importIntoRemotes = True
2576 self.maxChanges = ""
2577 self.changes_block_size = None
2578 self.keepRepoPath = False
2579 self.depotPaths = None
2580 self.p4BranchesInGit = []
2581 self.cloneExclude = []
2582 self.useClientSpec = False
2583 self.useClientSpec_from_options = False
2584 self.clientSpecDirs = None
2585 self.tempBranches = []
2586 self.tempBranchLocation = "refs/git-p4-tmp"
2587 self.largeFileSystem = None
2588 self.suppress_meta_comment = False
2590 if gitConfig('git-p4.largeFileSystem'):
2591 largeFileSystemConstructor = globals()[gitConfig('git-p4.largeFileSystem')]
2592 self.largeFileSystem = largeFileSystemConstructor(
2593 lambda git_mode, relPath, contents: self.writeToGitStream(git_mode, relPath, contents)
2596 if gitConfig("git-p4.syncFromOrigin") == "false":
2597 self.syncWithOrigin = False
2599 self.depotPaths = []
2600 self.changeRange = ""
2601 self.previousDepotPaths = []
2602 self.hasOrigin = False
2604 # map from branch depot path to parent branch
2605 self.knownBranches = {}
2606 self.initialParents = {}
2608 self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
2609 self.labels = {}
2611 # Force a checkpoint in fast-import and wait for it to finish
2612 def checkpoint(self):
2613 self.gitStream.write("checkpoint\n\n")
2614 self.gitStream.write("progress checkpoint\n\n")
2615 out = self.gitOutput.readline()
2616 if self.verbose:
2617 print("checkpoint finished: " + out)
2619 def extractFilesFromCommit(self, commit, shelved=False, shelved_cl = 0):
2620 self.cloneExclude = [re.sub(r"\.\.\.$", "", path)
2621 for path in self.cloneExclude]
2622 files = []
2623 fnum = 0
2624 while "depotFile%s" % fnum in commit:
2625 path = commit["depotFile%s" % fnum]
2627 if [p for p in self.cloneExclude
2628 if p4PathStartsWith(path, p)]:
2629 found = False
2630 else:
2631 found = [p for p in self.depotPaths
2632 if p4PathStartsWith(path, p)]
2633 if not found:
2634 fnum = fnum + 1
2635 continue
2637 file = {}
2638 file["path"] = path
2639 file["rev"] = commit["rev%s" % fnum]
2640 file["action"] = commit["action%s" % fnum]
2641 file["type"] = commit["type%s" % fnum]
2642 if shelved:
2643 file["shelved_cl"] = int(shelved_cl)
2644 files.append(file)
2645 fnum = fnum + 1
2646 return files
2648 def extractJobsFromCommit(self, commit):
2649 jobs = []
2650 jnum = 0
2651 while "job%s" % jnum in commit:
2652 job = commit["job%s" % jnum]
2653 jobs.append(job)
2654 jnum = jnum + 1
2655 return jobs
2657 def stripRepoPath(self, path, prefixes):
2658 """When streaming files, this is called to map a p4 depot path
2659 to where it should go in git. The prefixes are either
2660 self.depotPaths, or self.branchPrefixes in the case of
2661 branch detection."""
2663 if self.useClientSpec:
2664 # branch detection moves files up a level (the branch name)
2665 # from what client spec interpretation gives
2666 path = self.clientSpecDirs.map_in_client(path)
2667 if self.detectBranches:
2668 for b in self.knownBranches:
2669 if path.startswith(b + "/"):
2670 path = path[len(b)+1:]
2672 elif self.keepRepoPath:
2673 # Preserve everything in relative path name except leading
2674 # //depot/; just look at first prefix as they all should
2675 # be in the same depot.
2676 depot = re.sub("^(//[^/]+/).*", r'\1', prefixes[0])
2677 if p4PathStartsWith(path, depot):
2678 path = path[len(depot):]
2680 else:
2681 for p in prefixes:
2682 if p4PathStartsWith(path, p):
2683 path = path[len(p):]
2684 break
2686 path = wildcard_decode(path)
2687 return path
2689 def splitFilesIntoBranches(self, commit):
2690 """Look at each depotFile in the commit to figure out to what
2691 branch it belongs."""
2693 if self.clientSpecDirs:
2694 files = self.extractFilesFromCommit(commit)
2695 self.clientSpecDirs.update_client_spec_path_cache(files)
2697 branches = {}
2698 fnum = 0
2699 while "depotFile%s" % fnum in commit:
2700 path = commit["depotFile%s" % fnum]
2701 found = [p for p in self.depotPaths
2702 if p4PathStartsWith(path, p)]
2703 if not found:
2704 fnum = fnum + 1
2705 continue
2707 file = {}
2708 file["path"] = path
2709 file["rev"] = commit["rev%s" % fnum]
2710 file["action"] = commit["action%s" % fnum]
2711 file["type"] = commit["type%s" % fnum]
2712 fnum = fnum + 1
2714 # start with the full relative path where this file would
2715 # go in a p4 client
2716 if self.useClientSpec:
2717 relPath = self.clientSpecDirs.map_in_client(path)
2718 else:
2719 relPath = self.stripRepoPath(path, self.depotPaths)
2721 for branch in self.knownBranches.keys():
2722 # add a trailing slash so that a commit into qt/4.2foo
2723 # doesn't end up in qt/4.2, e.g.
2724 if relPath.startswith(branch + "/"):
2725 if branch not in branches:
2726 branches[branch] = []
2727 branches[branch].append(file)
2728 break
2730 return branches
2732 def writeToGitStream(self, gitMode, relPath, contents):
2733 self.gitStream.write('M %s inline %s\n' % (gitMode, relPath))
2734 self.gitStream.write('data %d\n' % sum(len(d) for d in contents))
2735 for d in contents:
2736 self.gitStream.write(d)
2737 self.gitStream.write('\n')
2739 def encodeWithUTF8(self, path):
2740 try:
2741 path.decode('ascii')
2742 except:
2743 encoding = 'utf8'
2744 if gitConfig('git-p4.pathEncoding'):
2745 encoding = gitConfig('git-p4.pathEncoding')
2746 path = path.decode(encoding, 'replace').encode('utf8', 'replace')
2747 if self.verbose:
2748 print('Path with non-ASCII characters detected. Used %s to encode: %s ' % (encoding, path))
2749 return path
2751 # output one file from the P4 stream
2752 # - helper for streamP4Files
2754 def streamOneP4File(self, file, contents):
2755 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)
2756 relPath = self.encodeWithUTF8(relPath)
2757 if verbose:
2758 if 'fileSize' in self.stream_file:
2759 size = int(self.stream_file['fileSize'])
2760 else:
2761 size = 0 # deleted files don't get a fileSize apparently
2762 sys.stdout.write('\r%s --> %s (%i MB)\n' % (file['depotFile'], relPath, size/1024/1024))
2763 sys.stdout.flush()
2765 (type_base, type_mods) = split_p4_type(file["type"])
2767 git_mode = "100644"
2768 if "x" in type_mods:
2769 git_mode = "100755"
2770 if type_base == "symlink":
2771 git_mode = "120000"
2772 # p4 print on a symlink sometimes contains "target\n";
2773 # if it does, remove the newline
2774 data = ''.join(contents)
2775 if not data:
2776 # Some version of p4 allowed creating a symlink that pointed
2777 # to nothing. This causes p4 errors when checking out such
2778 # a change, and errors here too. Work around it by ignoring
2779 # the bad symlink; hopefully a future change fixes it.
2780 print("\nIgnoring empty symlink in %s" % file['depotFile'])
2781 return
2782 elif data[-1] == '\n':
2783 contents = [data[:-1]]
2784 else:
2785 contents = [data]
2787 if type_base == "utf16":
2788 # p4 delivers different text in the python output to -G
2789 # than it does when using "print -o", or normal p4 client
2790 # operations. utf16 is converted to ascii or utf8, perhaps.
2791 # But ascii text saved as -t utf16 is completely mangled.
2792 # Invoke print -o to get the real contents.
2794 # On windows, the newlines will always be mangled by print, so put
2795 # them back too. This is not needed to the cygwin windows version,
2796 # just the native "NT" type.
2798 try:
2799 text = p4_read_pipe(['print', '-q', '-o', '-', '%s@%s' % (file['depotFile'], file['change'])])
2800 except Exception as e:
2801 if 'Translation of file content failed' in str(e):
2802 type_base = 'binary'
2803 else:
2804 raise e
2805 else:
2806 if p4_version_string().find('/NT') >= 0:
2807 text = text.replace('\r\n', '\n')
2808 contents = [ text ]
2810 if type_base == "apple":
2811 # Apple filetype files will be streamed as a concatenation of
2812 # its appledouble header and the contents. This is useless
2813 # on both macs and non-macs. If using "print -q -o xx", it
2814 # will create "xx" with the data, and "%xx" with the header.
2815 # This is also not very useful.
2817 # Ideally, someday, this script can learn how to generate
2818 # appledouble files directly and import those to git, but
2819 # non-mac machines can never find a use for apple filetype.
2820 print("\nIgnoring apple filetype file %s" % file['depotFile'])
2821 return
2823 # Note that we do not try to de-mangle keywords on utf16 files,
2824 # even though in theory somebody may want that.
2825 pattern = p4_keywords_regexp_for_type(type_base, type_mods)
2826 if pattern:
2827 regexp = re.compile(pattern, re.VERBOSE)
2828 text = ''.join(contents)
2829 text = regexp.sub(r'$\1$', text)
2830 contents = [ text ]
2832 if self.largeFileSystem:
2833 (git_mode, contents) = self.largeFileSystem.processContent(git_mode, relPath, contents)
2835 self.writeToGitStream(git_mode, relPath, contents)
2837 def streamOneP4Deletion(self, file):
2838 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)
2839 relPath = self.encodeWithUTF8(relPath)
2840 if verbose:
2841 sys.stdout.write("delete %s\n" % relPath)
2842 sys.stdout.flush()
2843 self.gitStream.write("D %s\n" % relPath)
2845 if self.largeFileSystem and self.largeFileSystem.isLargeFile(relPath):
2846 self.largeFileSystem.removeLargeFile(relPath)
2848 # handle another chunk of streaming data
2849 def streamP4FilesCb(self, marshalled):
2851 # catch p4 errors and complain
2852 err = None
2853 if "code" in marshalled:
2854 if marshalled["code"] == "error":
2855 if "data" in marshalled:
2856 err = marshalled["data"].rstrip()
2858 if not err and 'fileSize' in self.stream_file:
2859 required_bytes = int((4 * int(self.stream_file["fileSize"])) - calcDiskFree())
2860 if required_bytes > 0:
2861 err = 'Not enough space left on %s! Free at least %i MB.' % (
2862 os.getcwd(), required_bytes/1024/1024
2865 if err:
2866 f = None
2867 if self.stream_have_file_info:
2868 if "depotFile" in self.stream_file:
2869 f = self.stream_file["depotFile"]
2870 # force a failure in fast-import, else an empty
2871 # commit will be made
2872 self.gitStream.write("\n")
2873 self.gitStream.write("die-now\n")
2874 self.gitStream.close()
2875 # ignore errors, but make sure it exits first
2876 self.importProcess.wait()
2877 if f:
2878 die("Error from p4 print for %s: %s" % (f, err))
2879 else:
2880 die("Error from p4 print: %s" % err)
2882 if 'depotFile' in marshalled and self.stream_have_file_info:
2883 # start of a new file - output the old one first
2884 self.streamOneP4File(self.stream_file, self.stream_contents)
2885 self.stream_file = {}
2886 self.stream_contents = []
2887 self.stream_have_file_info = False
2889 # pick up the new file information... for the
2890 # 'data' field we need to append to our array
2891 for k in marshalled.keys():
2892 if k == 'data':
2893 if 'streamContentSize' not in self.stream_file:
2894 self.stream_file['streamContentSize'] = 0
2895 self.stream_file['streamContentSize'] += len(marshalled['data'])
2896 self.stream_contents.append(marshalled['data'])
2897 else:
2898 self.stream_file[k] = marshalled[k]
2900 if (verbose and
2901 'streamContentSize' in self.stream_file and
2902 'fileSize' in self.stream_file and
2903 'depotFile' in self.stream_file):
2904 size = int(self.stream_file["fileSize"])
2905 if size > 0:
2906 progress = 100*self.stream_file['streamContentSize']/size
2907 sys.stdout.write('\r%s %d%% (%i MB)' % (self.stream_file['depotFile'], progress, int(size/1024/1024)))
2908 sys.stdout.flush()
2910 self.stream_have_file_info = True
2912 # Stream directly from "p4 files" into "git fast-import"
2913 def streamP4Files(self, files):
2914 filesForCommit = []
2915 filesToRead = []
2916 filesToDelete = []
2918 for f in files:
2919 filesForCommit.append(f)
2920 if f['action'] in self.delete_actions:
2921 filesToDelete.append(f)
2922 else:
2923 filesToRead.append(f)
2925 # deleted files...
2926 for f in filesToDelete:
2927 self.streamOneP4Deletion(f)
2929 if len(filesToRead) > 0:
2930 self.stream_file = {}
2931 self.stream_contents = []
2932 self.stream_have_file_info = False
2934 # curry self argument
2935 def streamP4FilesCbSelf(entry):
2936 self.streamP4FilesCb(entry)
2938 fileArgs = []
2939 for f in filesToRead:
2940 if 'shelved_cl' in f:
2941 # Handle shelved CLs using the "p4 print file@=N" syntax to print
2942 # the contents
2943 fileArg = '%s@=%d' % (f['path'], f['shelved_cl'])
2944 else:
2945 fileArg = '%s#%s' % (f['path'], f['rev'])
2947 fileArgs.append(fileArg)
2949 p4CmdList(["-x", "-", "print"],
2950 stdin=fileArgs,
2951 cb=streamP4FilesCbSelf)
2953 # do the last chunk
2954 if 'depotFile' in self.stream_file:
2955 self.streamOneP4File(self.stream_file, self.stream_contents)
2957 def make_email(self, userid):
2958 if userid in self.users:
2959 return self.users[userid]
2960 else:
2961 return "%s <a@b>" % userid
2963 def streamTag(self, gitStream, labelName, labelDetails, commit, epoch):
2964 """ Stream a p4 tag.
2965 commit is either a git commit, or a fast-import mark, ":<p4commit>"
2968 if verbose:
2969 print("writing tag %s for commit %s" % (labelName, commit))
2970 gitStream.write("tag %s\n" % labelName)
2971 gitStream.write("from %s\n" % commit)
2973 if 'Owner' in labelDetails:
2974 owner = labelDetails["Owner"]
2975 else:
2976 owner = None
2978 # Try to use the owner of the p4 label, or failing that,
2979 # the current p4 user id.
2980 if owner:
2981 email = self.make_email(owner)
2982 else:
2983 email = self.make_email(self.p4UserId())
2984 tagger = "%s %s %s" % (email, epoch, self.tz)
2986 gitStream.write("tagger %s\n" % tagger)
2988 print("labelDetails=",labelDetails)
2989 if 'Description' in labelDetails:
2990 description = labelDetails['Description']
2991 else:
2992 description = 'Label from git p4'
2994 gitStream.write("data %d\n" % len(description))
2995 gitStream.write(description)
2996 gitStream.write("\n")
2998 def inClientSpec(self, path):
2999 if not self.clientSpecDirs:
3000 return True
3001 inClientSpec = self.clientSpecDirs.map_in_client(path)
3002 if not inClientSpec and self.verbose:
3003 print('Ignoring file outside of client spec: {0}'.format(path))
3004 return inClientSpec
3006 def hasBranchPrefix(self, path):
3007 if not self.branchPrefixes:
3008 return True
3009 hasPrefix = [p for p in self.branchPrefixes
3010 if p4PathStartsWith(path, p)]
3011 if not hasPrefix and self.verbose:
3012 print('Ignoring file outside of prefix: {0}'.format(path))
3013 return hasPrefix
3015 def commit(self, details, files, branch, parent = "", allow_empty=False):
3016 epoch = details["time"]
3017 author = details["user"]
3018 jobs = self.extractJobsFromCommit(details)
3020 if self.verbose:
3021 print('commit into {0}'.format(branch))
3023 if self.clientSpecDirs:
3024 self.clientSpecDirs.update_client_spec_path_cache(files)
3026 files = [f for f in files
3027 if self.inClientSpec(f['path']) and self.hasBranchPrefix(f['path'])]
3029 if gitConfigBool('git-p4.keepEmptyCommits'):
3030 allow_empty = True
3032 if not files and not allow_empty:
3033 print('Ignoring revision {0} as it would produce an empty commit.'
3034 .format(details['change']))
3035 return
3037 self.gitStream.write("commit %s\n" % branch)
3038 self.gitStream.write("mark :%s\n" % details["change"])
3039 self.committedChanges.add(int(details["change"]))
3040 committer = ""
3041 if author not in self.users:
3042 self.getUserMapFromPerforceServer()
3043 committer = "%s %s %s" % (self.make_email(author), epoch, self.tz)
3045 self.gitStream.write("committer %s\n" % committer)
3047 self.gitStream.write("data <<EOT\n")
3048 self.gitStream.write(details["desc"])
3049 if len(jobs) > 0:
3050 self.gitStream.write("\nJobs: %s" % (' '.join(jobs)))
3052 if not self.suppress_meta_comment:
3053 self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s" %
3054 (','.join(self.branchPrefixes), details["change"]))
3055 if len(details['options']) > 0:
3056 self.gitStream.write(": options = %s" % details['options'])
3057 self.gitStream.write("]\n")
3059 self.gitStream.write("EOT\n\n")
3061 if len(parent) > 0:
3062 if self.verbose:
3063 print("parent %s" % parent)
3064 self.gitStream.write("from %s\n" % parent)
3066 self.streamP4Files(files)
3067 self.gitStream.write("\n")
3069 change = int(details["change"])
3071 if change in self.labels:
3072 label = self.labels[change]
3073 labelDetails = label[0]
3074 labelRevisions = label[1]
3075 if self.verbose:
3076 print("Change %s is labelled %s" % (change, labelDetails))
3078 files = p4CmdList(["files"] + ["%s...@%s" % (p, change)
3079 for p in self.branchPrefixes])
3081 if len(files) == len(labelRevisions):
3083 cleanedFiles = {}
3084 for info in files:
3085 if info["action"] in self.delete_actions:
3086 continue
3087 cleanedFiles[info["depotFile"]] = info["rev"]
3089 if cleanedFiles == labelRevisions:
3090 self.streamTag(self.gitStream, 'tag_%s' % labelDetails['label'], labelDetails, branch, epoch)
3092 else:
3093 if not self.silent:
3094 print("Tag %s does not match with change %s: files do not match."
3095 % (labelDetails["label"], change))
3097 else:
3098 if not self.silent:
3099 print("Tag %s does not match with change %s: file count is different."
3100 % (labelDetails["label"], change))
3102 # Build a dictionary of changelists and labels, for "detect-labels" option.
3103 def getLabels(self):
3104 self.labels = {}
3106 l = p4CmdList(["labels"] + ["%s..." % p for p in self.depotPaths])
3107 if len(l) > 0 and not self.silent:
3108 print("Finding files belonging to labels in %s" % self.depotPaths)
3110 for output in l:
3111 label = output["label"]
3112 revisions = {}
3113 newestChange = 0
3114 if self.verbose:
3115 print("Querying files for label %s" % label)
3116 for file in p4CmdList(["files"] +
3117 ["%s...@%s" % (p, label)
3118 for p in self.depotPaths]):
3119 revisions[file["depotFile"]] = file["rev"]
3120 change = int(file["change"])
3121 if change > newestChange:
3122 newestChange = change
3124 self.labels[newestChange] = [output, revisions]
3126 if self.verbose:
3127 print("Label changes: %s" % self.labels.keys())
3129 # Import p4 labels as git tags. A direct mapping does not
3130 # exist, so assume that if all the files are at the same revision
3131 # then we can use that, or it's something more complicated we should
3132 # just ignore.
3133 def importP4Labels(self, stream, p4Labels):
3134 if verbose:
3135 print("import p4 labels: " + ' '.join(p4Labels))
3137 ignoredP4Labels = gitConfigList("git-p4.ignoredP4Labels")
3138 validLabelRegexp = gitConfig("git-p4.labelImportRegexp")
3139 if len(validLabelRegexp) == 0:
3140 validLabelRegexp = defaultLabelRegexp
3141 m = re.compile(validLabelRegexp)
3143 for name in p4Labels:
3144 commitFound = False
3146 if not m.match(name):
3147 if verbose:
3148 print("label %s does not match regexp %s" % (name,validLabelRegexp))
3149 continue
3151 if name in ignoredP4Labels:
3152 continue
3154 labelDetails = p4CmdList(['label', "-o", name])[0]
3156 # get the most recent changelist for each file in this label
3157 change = p4Cmd(["changes", "-m", "1"] + ["%s...@%s" % (p, name)
3158 for p in self.depotPaths])
3160 if 'change' in change:
3161 # find the corresponding git commit; take the oldest commit
3162 changelist = int(change['change'])
3163 if changelist in self.committedChanges:
3164 gitCommit = ":%d" % changelist # use a fast-import mark
3165 commitFound = True
3166 else:
3167 gitCommit = read_pipe(["git", "rev-list", "--max-count=1",
3168 "--reverse", ":/\[git-p4:.*change = %d\]" % changelist], ignore_error=True)
3169 if len(gitCommit) == 0:
3170 print("importing label %s: could not find git commit for changelist %d" % (name, changelist))
3171 else:
3172 commitFound = True
3173 gitCommit = gitCommit.strip()
3175 if commitFound:
3176 # Convert from p4 time format
3177 try:
3178 tmwhen = time.strptime(labelDetails['Update'], "%Y/%m/%d %H:%M:%S")
3179 except ValueError:
3180 print("Could not convert label time %s" % labelDetails['Update'])
3181 tmwhen = 1
3183 when = int(time.mktime(tmwhen))
3184 self.streamTag(stream, name, labelDetails, gitCommit, when)
3185 if verbose:
3186 print("p4 label %s mapped to git commit %s" % (name, gitCommit))
3187 else:
3188 if verbose:
3189 print("Label %s has no changelists - possibly deleted?" % name)
3191 if not commitFound:
3192 # We can't import this label; don't try again as it will get very
3193 # expensive repeatedly fetching all the files for labels that will
3194 # never be imported. If the label is moved in the future, the
3195 # ignore will need to be removed manually.
3196 system(["git", "config", "--add", "git-p4.ignoredP4Labels", name])
3198 def guessProjectName(self):
3199 for p in self.depotPaths:
3200 if p.endswith("/"):
3201 p = p[:-1]
3202 p = p[p.strip().rfind("/") + 1:]
3203 if not p.endswith("/"):
3204 p += "/"
3205 return p
3207 def getBranchMapping(self):
3208 lostAndFoundBranches = set()
3210 user = gitConfig("git-p4.branchUser")
3211 if len(user) > 0:
3212 command = "branches -u %s" % user
3213 else:
3214 command = "branches"
3216 for info in p4CmdList(command):
3217 details = p4Cmd(["branch", "-o", info["branch"]])
3218 viewIdx = 0
3219 while "View%s" % viewIdx in details:
3220 paths = details["View%s" % viewIdx].split(" ")
3221 viewIdx = viewIdx + 1
3222 # require standard //depot/foo/... //depot/bar/... mapping
3223 if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."):
3224 continue
3225 source = paths[0]
3226 destination = paths[1]
3227 ## HACK
3228 if p4PathStartsWith(source, self.depotPaths[0]) and p4PathStartsWith(destination, self.depotPaths[0]):
3229 source = source[len(self.depotPaths[0]):-4]
3230 destination = destination[len(self.depotPaths[0]):-4]
3232 if destination in self.knownBranches:
3233 if not self.silent:
3234 print("p4 branch %s defines a mapping from %s to %s" % (info["branch"], source, destination))
3235 print("but there exists another mapping from %s to %s already!" % (self.knownBranches[destination], destination))
3236 continue
3238 self.knownBranches[destination] = source
3240 lostAndFoundBranches.discard(destination)
3242 if source not in self.knownBranches:
3243 lostAndFoundBranches.add(source)
3245 # Perforce does not strictly require branches to be defined, so we also
3246 # check git config for a branch list.
3248 # Example of branch definition in git config file:
3249 # [git-p4]
3250 # branchList=main:branchA
3251 # branchList=main:branchB
3252 # branchList=branchA:branchC
3253 configBranches = gitConfigList("git-p4.branchList")
3254 for branch in configBranches:
3255 if branch:
3256 (source, destination) = branch.split(":")
3257 self.knownBranches[destination] = source
3259 lostAndFoundBranches.discard(destination)
3261 if source not in self.knownBranches:
3262 lostAndFoundBranches.add(source)
3265 for branch in lostAndFoundBranches:
3266 self.knownBranches[branch] = branch
3268 def getBranchMappingFromGitBranches(self):
3269 branches = p4BranchesInGit(self.importIntoRemotes)
3270 for branch in branches.keys():
3271 if branch == "master":
3272 branch = "main"
3273 else:
3274 branch = branch[len(self.projectName):]
3275 self.knownBranches[branch] = branch
3277 def updateOptionDict(self, d):
3278 option_keys = {}
3279 if self.keepRepoPath:
3280 option_keys['keepRepoPath'] = 1
3282 d["options"] = ' '.join(sorted(option_keys.keys()))
3284 def readOptions(self, d):
3285 self.keepRepoPath = ('options' in d
3286 and ('keepRepoPath' in d['options']))
3288 def gitRefForBranch(self, branch):
3289 if branch == "main":
3290 return self.refPrefix + "master"
3292 if len(branch) <= 0:
3293 return branch
3295 return self.refPrefix + self.projectName + branch
3297 def gitCommitByP4Change(self, ref, change):
3298 if self.verbose:
3299 print("looking in ref " + ref + " for change %s using bisect..." % change)
3301 earliestCommit = ""
3302 latestCommit = parseRevision(ref)
3304 while True:
3305 if self.verbose:
3306 print("trying: earliest %s latest %s" % (earliestCommit, latestCommit))
3307 next = read_pipe("git rev-list --bisect %s %s" % (latestCommit, earliestCommit)).strip()
3308 if len(next) == 0:
3309 if self.verbose:
3310 print("argh")
3311 return ""
3312 log = extractLogMessageFromGitCommit(next)
3313 settings = extractSettingsGitLog(log)
3314 currentChange = int(settings['change'])
3315 if self.verbose:
3316 print("current change %s" % currentChange)
3318 if currentChange == change:
3319 if self.verbose:
3320 print("found %s" % next)
3321 return next
3323 if currentChange < change:
3324 earliestCommit = "^%s" % next
3325 else:
3326 latestCommit = "%s" % next
3328 return ""
3330 def importNewBranch(self, branch, maxChange):
3331 # make fast-import flush all changes to disk and update the refs using the checkpoint
3332 # command so that we can try to find the branch parent in the git history
3333 self.gitStream.write("checkpoint\n\n");
3334 self.gitStream.flush();
3335 branchPrefix = self.depotPaths[0] + branch + "/"
3336 range = "@1,%s" % maxChange
3337 #print "prefix" + branchPrefix
3338 changes = p4ChangesForPaths([branchPrefix], range, self.changes_block_size)
3339 if len(changes) <= 0:
3340 return False
3341 firstChange = changes[0]
3342 #print "first change in branch: %s" % firstChange
3343 sourceBranch = self.knownBranches[branch]
3344 sourceDepotPath = self.depotPaths[0] + sourceBranch
3345 sourceRef = self.gitRefForBranch(sourceBranch)
3346 #print "source " + sourceBranch
3348 branchParentChange = int(p4Cmd(["changes", "-m", "1", "%s...@1,%s" % (sourceDepotPath, firstChange)])["change"])
3349 #print "branch parent: %s" % branchParentChange
3350 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)
3351 if len(gitParent) > 0:
3352 self.initialParents[self.gitRefForBranch(branch)] = gitParent
3353 #print "parent git commit: %s" % gitParent
3355 self.importChanges(changes)
3356 return True
3358 def searchParent(self, parent, branch, target):
3359 parentFound = False
3360 for blob in read_pipe_lines(["git", "rev-list", "--reverse",
3361 "--no-merges", parent]):
3362 blob = blob.strip()
3363 if len(read_pipe(["git", "diff-tree", blob, target])) == 0:
3364 parentFound = True
3365 if self.verbose:
3366 print("Found parent of %s in commit %s" % (branch, blob))
3367 break
3368 if parentFound:
3369 return blob
3370 else:
3371 return None
3373 def importChanges(self, changes, origin_revision=0):
3374 cnt = 1
3375 for change in changes:
3376 description = p4_describe(change)
3377 self.updateOptionDict(description)
3379 if not self.silent:
3380 sys.stdout.write("\rImporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
3381 sys.stdout.flush()
3382 cnt = cnt + 1
3384 try:
3385 if self.detectBranches:
3386 branches = self.splitFilesIntoBranches(description)
3387 for branch in branches.keys():
3388 ## HACK --hwn
3389 branchPrefix = self.depotPaths[0] + branch + "/"
3390 self.branchPrefixes = [ branchPrefix ]
3392 parent = ""
3394 filesForCommit = branches[branch]
3396 if self.verbose:
3397 print("branch is %s" % branch)
3399 self.updatedBranches.add(branch)
3401 if branch not in self.createdBranches:
3402 self.createdBranches.add(branch)
3403 parent = self.knownBranches[branch]
3404 if parent == branch:
3405 parent = ""
3406 else:
3407 fullBranch = self.projectName + branch
3408 if fullBranch not in self.p4BranchesInGit:
3409 if not self.silent:
3410 print("\n Importing new branch %s" % fullBranch);
3411 if self.importNewBranch(branch, change - 1):
3412 parent = ""
3413 self.p4BranchesInGit.append(fullBranch)
3414 if not self.silent:
3415 print("\n Resuming with change %s" % change);
3417 if self.verbose:
3418 print("parent determined through known branches: %s" % parent)
3420 branch = self.gitRefForBranch(branch)
3421 parent = self.gitRefForBranch(parent)
3423 if self.verbose:
3424 print("looking for initial parent for %s; current parent is %s" % (branch, parent))
3426 if len(parent) == 0 and branch in self.initialParents:
3427 parent = self.initialParents[branch]
3428 del self.initialParents[branch]
3430 blob = None
3431 if len(parent) > 0:
3432 tempBranch = "%s/%d" % (self.tempBranchLocation, change)
3433 if self.verbose:
3434 print("Creating temporary branch: " + tempBranch)
3435 self.commit(description, filesForCommit, tempBranch)
3436 self.tempBranches.append(tempBranch)
3437 self.checkpoint()
3438 blob = self.searchParent(parent, branch, tempBranch)
3439 if blob:
3440 self.commit(description, filesForCommit, branch, blob)
3441 else:
3442 if self.verbose:
3443 print("Parent of %s not found. Committing into head of %s" % (branch, parent))
3444 self.commit(description, filesForCommit, branch, parent)
3445 else:
3446 files = self.extractFilesFromCommit(description)
3447 self.commit(description, files, self.branch,
3448 self.initialParent)
3449 # only needed once, to connect to the previous commit
3450 self.initialParent = ""
3451 except IOError:
3452 print(self.gitError.read())
3453 sys.exit(1)
3455 def sync_origin_only(self):
3456 if self.syncWithOrigin:
3457 self.hasOrigin = originP4BranchesExist()
3458 if self.hasOrigin:
3459 if not self.silent:
3460 print('Syncing with origin first, using "git fetch origin"')
3461 system("git fetch origin")
3463 def importHeadRevision(self, revision):
3464 print("Doing initial import of %s from revision %s into %s" % (' '.join(self.depotPaths), revision, self.branch))
3466 details = {}
3467 details["user"] = "git perforce import user"
3468 details["desc"] = ("Initial import of %s from the state at revision %s\n"
3469 % (' '.join(self.depotPaths), revision))
3470 details["change"] = revision
3471 newestRevision = 0
3473 fileCnt = 0
3474 fileArgs = ["%s...%s" % (p,revision) for p in self.depotPaths]
3476 for info in p4CmdList(["files"] + fileArgs):
3478 if 'code' in info and info['code'] == 'error':
3479 sys.stderr.write("p4 returned an error: %s\n"
3480 % info['data'])
3481 if info['data'].find("must refer to client") >= 0:
3482 sys.stderr.write("This particular p4 error is misleading.\n")
3483 sys.stderr.write("Perhaps the depot path was misspelled.\n");
3484 sys.stderr.write("Depot path: %s\n" % " ".join(self.depotPaths))
3485 sys.exit(1)
3486 if 'p4ExitCode' in info:
3487 sys.stderr.write("p4 exitcode: %s\n" % info['p4ExitCode'])
3488 sys.exit(1)
3491 change = int(info["change"])
3492 if change > newestRevision:
3493 newestRevision = change
3495 if info["action"] in self.delete_actions:
3496 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
3497 #fileCnt = fileCnt + 1
3498 continue
3500 for prop in ["depotFile", "rev", "action", "type" ]:
3501 details["%s%s" % (prop, fileCnt)] = info[prop]
3503 fileCnt = fileCnt + 1
3505 details["change"] = newestRevision
3507 # Use time from top-most change so that all git p4 clones of
3508 # the same p4 repo have the same commit SHA1s.
3509 res = p4_describe(newestRevision)
3510 details["time"] = res["time"]
3512 self.updateOptionDict(details)
3513 try:
3514 self.commit(details, self.extractFilesFromCommit(details), self.branch)
3515 except IOError:
3516 print("IO error with git fast-import. Is your git version recent enough?")
3517 print(self.gitError.read())
3519 def openStreams(self):
3520 self.importProcess = subprocess.Popen(["git", "fast-import"],
3521 stdin=subprocess.PIPE,
3522 stdout=subprocess.PIPE,
3523 stderr=subprocess.PIPE);
3524 self.gitOutput = self.importProcess.stdout
3525 self.gitStream = self.importProcess.stdin
3526 self.gitError = self.importProcess.stderr
3528 def closeStreams(self):
3529 self.gitStream.close()
3530 if self.importProcess.wait() != 0:
3531 die("fast-import failed: %s" % self.gitError.read())
3532 self.gitOutput.close()
3533 self.gitError.close()
3535 def run(self, args):
3536 if self.importIntoRemotes:
3537 self.refPrefix = "refs/remotes/p4/"
3538 else:
3539 self.refPrefix = "refs/heads/p4/"
3541 self.sync_origin_only()
3543 branch_arg_given = bool(self.branch)
3544 if len(self.branch) == 0:
3545 self.branch = self.refPrefix + "master"
3546 if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
3547 system("git update-ref %s refs/heads/p4" % self.branch)
3548 system("git branch -D p4")
3550 # accept either the command-line option, or the configuration variable
3551 if self.useClientSpec:
3552 # will use this after clone to set the variable
3553 self.useClientSpec_from_options = True
3554 else:
3555 if gitConfigBool("git-p4.useclientspec"):
3556 self.useClientSpec = True
3557 if self.useClientSpec:
3558 self.clientSpecDirs = getClientSpec()
3560 # TODO: should always look at previous commits,
3561 # merge with previous imports, if possible.
3562 if args == []:
3563 if self.hasOrigin:
3564 createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)
3566 # branches holds mapping from branch name to sha1
3567 branches = p4BranchesInGit(self.importIntoRemotes)
3569 # restrict to just this one, disabling detect-branches
3570 if branch_arg_given:
3571 short = self.branch.split("/")[-1]
3572 if short in branches:
3573 self.p4BranchesInGit = [ short ]
3574 else:
3575 self.p4BranchesInGit = branches.keys()
3577 if len(self.p4BranchesInGit) > 1:
3578 if not self.silent:
3579 print("Importing from/into multiple branches")
3580 self.detectBranches = True
3581 for branch in branches.keys():
3582 self.initialParents[self.refPrefix + branch] = \
3583 branches[branch]
3585 if self.verbose:
3586 print("branches: %s" % self.p4BranchesInGit)
3588 p4Change = 0
3589 for branch in self.p4BranchesInGit:
3590 logMsg = extractLogMessageFromGitCommit(self.refPrefix + branch)
3592 settings = extractSettingsGitLog(logMsg)
3594 self.readOptions(settings)
3595 if ('depot-paths' in settings
3596 and 'change' in settings):
3597 change = int(settings['change']) + 1
3598 p4Change = max(p4Change, change)
3600 depotPaths = sorted(settings['depot-paths'])
3601 if self.previousDepotPaths == []:
3602 self.previousDepotPaths = depotPaths
3603 else:
3604 paths = []
3605 for (prev, cur) in zip(self.previousDepotPaths, depotPaths):
3606 prev_list = prev.split("/")
3607 cur_list = cur.split("/")
3608 for i in range(0, min(len(cur_list), len(prev_list))):
3609 if cur_list[i] != prev_list[i]:
3610 i = i - 1
3611 break
3613 paths.append ("/".join(cur_list[:i + 1]))
3615 self.previousDepotPaths = paths
3617 if p4Change > 0:
3618 self.depotPaths = sorted(self.previousDepotPaths)
3619 self.changeRange = "@%s,#head" % p4Change
3620 if not self.silent and not self.detectBranches:
3621 print("Performing incremental import into %s git branch" % self.branch)
3623 # accept multiple ref name abbreviations:
3624 # refs/foo/bar/branch -> use it exactly
3625 # p4/branch -> prepend refs/remotes/ or refs/heads/
3626 # branch -> prepend refs/remotes/p4/ or refs/heads/p4/
3627 if not self.branch.startswith("refs/"):
3628 if self.importIntoRemotes:
3629 prepend = "refs/remotes/"
3630 else:
3631 prepend = "refs/heads/"
3632 if not self.branch.startswith("p4/"):
3633 prepend += "p4/"
3634 self.branch = prepend + self.branch
3636 if len(args) == 0 and self.depotPaths:
3637 if not self.silent:
3638 print("Depot paths: %s" % ' '.join(self.depotPaths))
3639 else:
3640 if self.depotPaths and self.depotPaths != args:
3641 print("previous import used depot path %s and now %s was specified. "
3642 "This doesn't work!" % (' '.join (self.depotPaths),
3643 ' '.join (args)))
3644 sys.exit(1)
3646 self.depotPaths = sorted(args)
3648 revision = ""
3649 self.users = {}
3651 # Make sure no revision specifiers are used when --changesfile
3652 # is specified.
3653 bad_changesfile = False
3654 if len(self.changesFile) > 0:
3655 for p in self.depotPaths:
3656 if p.find("@") >= 0 or p.find("#") >= 0:
3657 bad_changesfile = True
3658 break
3659 if bad_changesfile:
3660 die("Option --changesfile is incompatible with revision specifiers")
3662 newPaths = []
3663 for p in self.depotPaths:
3664 if p.find("@") != -1:
3665 atIdx = p.index("@")
3666 self.changeRange = p[atIdx:]
3667 if self.changeRange == "@all":
3668 self.changeRange = ""
3669 elif ',' not in self.changeRange:
3670 revision = self.changeRange
3671 self.changeRange = ""
3672 p = p[:atIdx]
3673 elif p.find("#") != -1:
3674 hashIdx = p.index("#")
3675 revision = p[hashIdx:]
3676 p = p[:hashIdx]
3677 elif self.previousDepotPaths == []:
3678 # pay attention to changesfile, if given, else import
3679 # the entire p4 tree at the head revision
3680 if len(self.changesFile) == 0:
3681 revision = "#head"
3683 p = re.sub ("\.\.\.$", "", p)
3684 if not p.endswith("/"):
3685 p += "/"
3687 newPaths.append(p)
3689 self.depotPaths = newPaths
3691 # --detect-branches may change this for each branch
3692 self.branchPrefixes = self.depotPaths
3694 self.loadUserMapFromCache()
3695 self.labels = {}
3696 if self.detectLabels:
3697 self.getLabels();
3699 if self.detectBranches:
3700 ## FIXME - what's a P4 projectName ?
3701 self.projectName = self.guessProjectName()
3703 if self.hasOrigin:
3704 self.getBranchMappingFromGitBranches()
3705 else:
3706 self.getBranchMapping()
3707 if self.verbose:
3708 print("p4-git branches: %s" % self.p4BranchesInGit)
3709 print("initial parents: %s" % self.initialParents)
3710 for b in self.p4BranchesInGit:
3711 if b != "master":
3713 ## FIXME
3714 b = b[len(self.projectName):]
3715 self.createdBranches.add(b)
3717 self.openStreams()
3719 if revision:
3720 self.importHeadRevision(revision)
3721 else:
3722 changes = []
3724 if len(self.changesFile) > 0:
3725 output = open(self.changesFile).readlines()
3726 changeSet = set()
3727 for line in output:
3728 changeSet.add(int(line))
3730 for change in changeSet:
3731 changes.append(change)
3733 changes.sort()
3734 else:
3735 # catch "git p4 sync" with no new branches, in a repo that
3736 # does not have any existing p4 branches
3737 if len(args) == 0:
3738 if not self.p4BranchesInGit:
3739 die("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here.")
3741 # The default branch is master, unless --branch is used to
3742 # specify something else. Make sure it exists, or complain
3743 # nicely about how to use --branch.
3744 if not self.detectBranches:
3745 if not branch_exists(self.branch):
3746 if branch_arg_given:
3747 die("Error: branch %s does not exist." % self.branch)
3748 else:
3749 die("Error: no branch %s; perhaps specify one with --branch." %
3750 self.branch)
3752 if self.verbose:
3753 print("Getting p4 changes for %s...%s" % (', '.join(self.depotPaths),
3754 self.changeRange))
3755 changes = p4ChangesForPaths(self.depotPaths, self.changeRange, self.changes_block_size)
3757 if len(self.maxChanges) > 0:
3758 changes = changes[:min(int(self.maxChanges), len(changes))]
3760 if len(changes) == 0:
3761 if not self.silent:
3762 print("No changes to import!")
3763 else:
3764 if not self.silent and not self.detectBranches:
3765 print("Import destination: %s" % self.branch)
3767 self.updatedBranches = set()
3769 if not self.detectBranches:
3770 if args:
3771 # start a new branch
3772 self.initialParent = ""
3773 else:
3774 # build on a previous revision
3775 self.initialParent = parseRevision(self.branch)
3777 self.importChanges(changes)
3779 if not self.silent:
3780 print("")
3781 if len(self.updatedBranches) > 0:
3782 sys.stdout.write("Updated branches: ")
3783 for b in self.updatedBranches:
3784 sys.stdout.write("%s " % b)
3785 sys.stdout.write("\n")
3787 if gitConfigBool("git-p4.importLabels"):
3788 self.importLabels = True
3790 if self.importLabels:
3791 p4Labels = getP4Labels(self.depotPaths)
3792 gitTags = getGitTags()
3794 missingP4Labels = p4Labels - gitTags
3795 self.importP4Labels(self.gitStream, missingP4Labels)
3797 self.closeStreams()
3799 # Cleanup temporary branches created during import
3800 if self.tempBranches != []:
3801 for branch in self.tempBranches:
3802 read_pipe("git update-ref -d %s" % branch)
3803 os.rmdir(os.path.join(os.environ.get("GIT_DIR", ".git"), self.tempBranchLocation))
3805 # Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow
3806 # a convenient shortcut refname "p4".
3807 if self.importIntoRemotes:
3808 head_ref = self.refPrefix + "HEAD"
3809 if not gitBranchExists(head_ref) and gitBranchExists(self.branch):
3810 system(["git", "symbolic-ref", head_ref, self.branch])
3812 return True
3814 class P4Rebase(Command):
3815 def __init__(self):
3816 Command.__init__(self)
3817 self.options = [
3818 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),
3820 self.importLabels = False
3821 self.description = ("Fetches the latest revision from perforce and "
3822 + "rebases the current work (branch) against it")
3824 def run(self, args):
3825 sync = P4Sync()
3826 sync.importLabels = self.importLabels
3827 sync.run([])
3829 return self.rebase()
3831 def rebase(self):
3832 if os.system("git update-index --refresh") != 0:
3833 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.");
3834 if len(read_pipe("git diff-index HEAD --")) > 0:
3835 die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
3837 [upstream, settings] = findUpstreamBranchPoint()
3838 if len(upstream) == 0:
3839 die("Cannot find upstream branchpoint for rebase")
3841 # the branchpoint may be p4/foo~3, so strip off the parent
3842 upstream = re.sub("~[0-9]+$", "", upstream)
3844 print("Rebasing the current branch onto %s" % upstream)
3845 oldHead = read_pipe("git rev-parse HEAD").strip()
3846 system("git rebase %s" % upstream)
3847 system("git diff-tree --stat --summary -M %s HEAD --" % oldHead)
3848 return True
3850 class P4Clone(P4Sync):
3851 def __init__(self):
3852 P4Sync.__init__(self)
3853 self.description = "Creates a new git repository and imports from Perforce into it"
3854 self.usage = "usage: %prog [options] //depot/path[@revRange]"
3855 self.options += [
3856 optparse.make_option("--destination", dest="cloneDestination",
3857 action='store', default=None,
3858 help="where to leave result of the clone"),
3859 optparse.make_option("--bare", dest="cloneBare",
3860 action="store_true", default=False),
3862 self.cloneDestination = None
3863 self.needsGit = False
3864 self.cloneBare = False
3866 def defaultDestination(self, args):
3867 ## TODO: use common prefix of args?
3868 depotPath = args[0]
3869 depotDir = re.sub("(@[^@]*)$", "", depotPath)
3870 depotDir = re.sub("(#[^#]*)$", "", depotDir)
3871 depotDir = re.sub(r"\.\.\.$", "", depotDir)
3872 depotDir = re.sub(r"/$", "", depotDir)
3873 return os.path.split(depotDir)[1]
3875 def run(self, args):
3876 if len(args) < 1:
3877 return False
3879 if self.keepRepoPath and not self.cloneDestination:
3880 sys.stderr.write("Must specify destination for --keep-path\n")
3881 sys.exit(1)
3883 depotPaths = args
3885 if not self.cloneDestination and len(depotPaths) > 1:
3886 self.cloneDestination = depotPaths[-1]
3887 depotPaths = depotPaths[:-1]
3889 self.cloneExclude = ["/"+p for p in self.cloneExclude]
3890 for p in depotPaths:
3891 if not p.startswith("//"):
3892 sys.stderr.write('Depot paths must start with "//": %s\n' % p)
3893 return False
3895 if not self.cloneDestination:
3896 self.cloneDestination = self.defaultDestination(args)
3898 print("Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination))
3900 if not os.path.exists(self.cloneDestination):
3901 os.makedirs(self.cloneDestination)
3902 chdir(self.cloneDestination)
3904 init_cmd = [ "git", "init" ]
3905 if self.cloneBare:
3906 init_cmd.append("--bare")
3907 retcode = subprocess.call(init_cmd)
3908 if retcode:
3909 raise CalledProcessError(retcode, init_cmd)
3911 if not P4Sync.run(self, depotPaths):
3912 return False
3914 # create a master branch and check out a work tree
3915 if gitBranchExists(self.branch):
3916 system([ "git", "branch", "master", self.branch ])
3917 if not self.cloneBare:
3918 system([ "git", "checkout", "-f" ])
3919 else:
3920 print('Not checking out any branch, use ' \
3921 '"git checkout -q -b master <branch>"')
3923 # auto-set this variable if invoked with --use-client-spec
3924 if self.useClientSpec_from_options:
3925 system("git config --bool git-p4.useclientspec true")
3927 return True
3929 class P4Unshelve(Command):
3930 def __init__(self):
3931 Command.__init__(self)
3932 self.options = []
3933 self.origin = "HEAD"
3934 self.description = "Unshelve a P4 changelist into a git commit"
3935 self.usage = "usage: %prog [options] changelist"
3936 self.options += [
3937 optparse.make_option("--origin", dest="origin",
3938 help="Use this base revision instead of the default (%s)" % self.origin),
3940 self.verbose = False
3941 self.noCommit = False
3942 self.destbranch = "refs/remotes/p4-unshelved"
3944 def renameBranch(self, branch_name):
3945 """ Rename the existing branch to branch_name.N
3948 found = True
3949 for i in range(0,1000):
3950 backup_branch_name = "{0}.{1}".format(branch_name, i)
3951 if not gitBranchExists(backup_branch_name):
3952 gitUpdateRef(backup_branch_name, branch_name) # copy ref to backup
3953 gitDeleteRef(branch_name)
3954 found = True
3955 print("renamed old unshelve branch to {0}".format(backup_branch_name))
3956 break
3958 if not found:
3959 sys.exit("gave up trying to rename existing branch {0}".format(sync.branch))
3961 def findLastP4Revision(self, starting_point):
3962 """ Look back from starting_point for the first commit created by git-p4
3963 to find the P4 commit we are based on, and the depot-paths.
3966 for parent in (range(65535)):
3967 log = extractLogMessageFromGitCommit("{0}^{1}".format(starting_point, parent))
3968 settings = extractSettingsGitLog(log)
3969 if 'change' in settings:
3970 return settings
3972 sys.exit("could not find git-p4 commits in {0}".format(self.origin))
3974 def createShelveParent(self, change, branch_name, sync, origin):
3975 """ Create a commit matching the parent of the shelved changelist 'change'
3977 parent_description = p4_describe(change, shelved=True)
3978 parent_description['desc'] = 'parent for shelved changelist {}\n'.format(change)
3979 files = sync.extractFilesFromCommit(parent_description, shelved=False, shelved_cl=change)
3981 parent_files = []
3982 for f in files:
3983 # if it was added in the shelved changelist, it won't exist in the parent
3984 if f['action'] in self.add_actions:
3985 continue
3987 # if it was deleted in the shelved changelist it must not be deleted
3988 # in the parent - we might even need to create it if the origin branch
3989 # does not have it
3990 if f['action'] in self.delete_actions:
3991 f['action'] = 'add'
3993 parent_files.append(f)
3995 sync.commit(parent_description, parent_files, branch_name,
3996 parent=origin, allow_empty=True)
3997 print("created parent commit for {0} based on {1} in {2}".format(
3998 change, self.origin, branch_name))
4000 def run(self, args):
4001 if len(args) != 1:
4002 return False
4004 if not gitBranchExists(self.origin):
4005 sys.exit("origin branch {0} does not exist".format(self.origin))
4007 sync = P4Sync()
4008 changes = args
4010 # only one change at a time
4011 change = changes[0]
4013 # if the target branch already exists, rename it
4014 branch_name = "{0}/{1}".format(self.destbranch, change)
4015 if gitBranchExists(branch_name):
4016 self.renameBranch(branch_name)
4017 sync.branch = branch_name
4019 sync.verbose = self.verbose
4020 sync.suppress_meta_comment = True
4022 settings = self.findLastP4Revision(self.origin)
4023 sync.depotPaths = settings['depot-paths']
4024 sync.branchPrefixes = sync.depotPaths
4026 sync.openStreams()
4027 sync.loadUserMapFromCache()
4028 sync.silent = True
4030 # create a commit for the parent of the shelved changelist
4031 self.createShelveParent(change, branch_name, sync, self.origin)
4033 # create the commit for the shelved changelist itself
4034 description = p4_describe(change, True)
4035 files = sync.extractFilesFromCommit(description, True, change)
4037 sync.commit(description, files, branch_name, "")
4038 sync.closeStreams()
4040 print("unshelved changelist {0} into {1}".format(change, branch_name))
4042 return True
4044 class P4Branches(Command):
4045 def __init__(self):
4046 Command.__init__(self)
4047 self.options = [ ]
4048 self.description = ("Shows the git branches that hold imports and their "
4049 + "corresponding perforce depot paths")
4050 self.verbose = False
4052 def run(self, args):
4053 if originP4BranchesExist():
4054 createOrUpdateBranchesFromOrigin()
4056 cmdline = "git rev-parse --symbolic "
4057 cmdline += " --remotes"
4059 for line in read_pipe_lines(cmdline):
4060 line = line.strip()
4062 if not line.startswith('p4/') or line == "p4/HEAD":
4063 continue
4064 branch = line
4066 log = extractLogMessageFromGitCommit("refs/remotes/%s" % branch)
4067 settings = extractSettingsGitLog(log)
4069 print("%s <= %s (%s)" % (branch, ",".join(settings["depot-paths"]), settings["change"]))
4070 return True
4072 class HelpFormatter(optparse.IndentedHelpFormatter):
4073 def __init__(self):
4074 optparse.IndentedHelpFormatter.__init__(self)
4076 def format_description(self, description):
4077 if description:
4078 return description + "\n"
4079 else:
4080 return ""
4082 def printUsage(commands):
4083 print("usage: %s <command> [options]" % sys.argv[0])
4084 print("")
4085 print("valid commands: %s" % ", ".join(commands))
4086 print("")
4087 print("Try %s <command> --help for command specific help." % sys.argv[0])
4088 print("")
4090 commands = {
4091 "debug" : P4Debug,
4092 "submit" : P4Submit,
4093 "commit" : P4Submit,
4094 "sync" : P4Sync,
4095 "rebase" : P4Rebase,
4096 "clone" : P4Clone,
4097 "rollback" : P4RollBack,
4098 "branches" : P4Branches,
4099 "unshelve" : P4Unshelve,
4103 def main():
4104 if len(sys.argv[1:]) == 0:
4105 printUsage(commands.keys())
4106 sys.exit(2)
4108 cmdName = sys.argv[1]
4109 try:
4110 klass = commands[cmdName]
4111 cmd = klass()
4112 except KeyError:
4113 print("unknown command %s" % cmdName)
4114 print("")
4115 printUsage(commands.keys())
4116 sys.exit(2)
4118 options = cmd.options
4119 cmd.gitdir = os.environ.get("GIT_DIR", None)
4121 args = sys.argv[2:]
4123 options.append(optparse.make_option("--verbose", "-v", dest="verbose", action="store_true"))
4124 if cmd.needsGit:
4125 options.append(optparse.make_option("--git-dir", dest="gitdir"))
4127 parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
4128 options,
4129 description = cmd.description,
4130 formatter = HelpFormatter())
4132 (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
4133 global verbose
4134 verbose = cmd.verbose
4135 if cmd.needsGit:
4136 if cmd.gitdir == None:
4137 cmd.gitdir = os.path.abspath(".git")
4138 if not isValidGitDir(cmd.gitdir):
4139 # "rev-parse --git-dir" without arguments will try $PWD/.git
4140 cmd.gitdir = read_pipe("git rev-parse --git-dir").strip()
4141 if os.path.exists(cmd.gitdir):
4142 cdup = read_pipe("git rev-parse --show-cdup").strip()
4143 if len(cdup) > 0:
4144 chdir(cdup);
4146 if not isValidGitDir(cmd.gitdir):
4147 if isValidGitDir(cmd.gitdir + "/.git"):
4148 cmd.gitdir += "/.git"
4149 else:
4150 die("fatal: cannot locate git repository at %s" % cmd.gitdir)
4152 # so git commands invoked from the P4 workspace will succeed
4153 os.environ["GIT_DIR"] = cmd.gitdir
4155 if not cmd.run(args):
4156 parser.print_help()
4157 sys.exit(2)
4160 if __name__ == '__main__':
4161 main()