1#!/usr/bin/env python 2# 3# git-p4.py -- A tool for bidirectional operation between a Perforce depot and git. 4# 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> 9# 10import sys 11if sys.hexversion <0x02040000: 12# The limiter is the subprocess module 13 sys.stderr.write("git-p4: requires Python 2.4 or later.\n") 14 sys.exit(1) 15import os 16import optparse 17import marshal 18import subprocess 19import tempfile 20import time 21import platform 22import re 23import shutil 24import stat 25import zipfile 26import zlib 27import ctypes 28import errno 29 30# support basestring in python3 31try: 32unicode=unicode 33exceptNameError: 34# 'unicode' is undefined, must be Python 3 35str=str 36unicode=str 37bytes=bytes 38 basestring = (str,bytes) 39else: 40# 'unicode' exists, must be Python 2 41str=str 42unicode=unicode 43bytes=str 44 basestring = basestring 45 46try: 47from subprocess import CalledProcessError 48exceptImportError: 49# from python2.7:subprocess.py 50# Exception classes used by this module. 51classCalledProcessError(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.""" 55def__init__(self, returncode, cmd): 56 self.returncode = returncode 57 self.cmd = cmd 58def__str__(self): 59return"Command '%s' returned non-zero exit status%d"% (self.cmd, self.returncode) 60 61verbose =False 62 63# Only labels/tags matching this will be imported/exported 64defaultLabelRegexp = r'[a-zA-Z0-9_\-.]+$' 65 66# The block size is reduced automatically if required 67defaultBlockSize =1<<20 68 69p4_access_checked =False 70 71defp4_build_cmd(cmd): 72"""Build a suitable p4 command line. 73 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"] 79 80 user =gitConfig("git-p4.user") 81iflen(user) >0: 82 real_cmd += ["-u",user] 83 84 password =gitConfig("git-p4.password") 85iflen(password) >0: 86 real_cmd += ["-P", password] 87 88 port =gitConfig("git-p4.port") 89iflen(port) >0: 90 real_cmd += ["-p", port] 91 92 host =gitConfig("git-p4.host") 93iflen(host) >0: 94 real_cmd += ["-H", host] 95 96 client =gitConfig("git-p4.client") 97iflen(client) >0: 98 real_cmd += ["-c", client] 99 100 retries =gitConfigInt("git-p4.retries") 101if retries is None: 102# Perform 3 retries by default 103 retries =3 104if retries >0: 105# Provide a way to not pass this option by setting git-p4.retries to 0 106 real_cmd += ["-r",str(retries)] 107 108ifisinstance(cmd,basestring): 109 real_cmd =' '.join(real_cmd) +' '+ cmd 110else: 111 real_cmd += cmd 112 113# now check that we can actually talk to the server 114global p4_access_checked 115if not p4_access_checked: 116 p4_access_checked =True# suppress access checks in p4_check_access itself 117p4_check_access() 118 119return real_cmd 120 121defgit_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. 124 """ 125 d =read_pipe(["git","--git-dir", path,"rev-parse","--git-dir"],True).strip() 126if not d orlen(d) ==0: 127return None 128else: 129return d 130 131defchdir(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. 136 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. 141 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. 146 """ 147 148 os.chdir(path) 149if not is_client_path: 150 path = os.getcwd() 151 os.environ['PWD'] = path 152 153defcalcDiskFree(): 154"""Return free space in bytes on the disk of the given dirname.""" 155if 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)) 158return free_bytes.value 159else: 160 st = os.statvfs(os.getcwd()) 161return st.f_bavail * st.f_frsize 162 163defdie(msg): 164if verbose: 165raiseException(msg) 166else: 167 sys.stderr.write(msg +"\n") 168 sys.exit(1) 169 170defwrite_pipe(c, stdin): 171if verbose: 172 sys.stderr.write('Writing pipe:%s\n'%str(c)) 173 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() 179if p.wait(): 180die('Command failed:%s'%str(c)) 181 182return val 183 184defp4_write_pipe(c, stdin): 185 real_cmd =p4_build_cmd(c) 186returnwrite_pipe(real_cmd, stdin) 187 188defread_pipe_full(c): 189""" Read output from command. Returns a tuple 190 of the return status, stdout text and stderr 191 text. 192 """ 193if verbose: 194 sys.stderr.write('Reading pipe:%s\n'%str(c)) 195 196 expand =isinstance(c,basestring) 197 p = subprocess.Popen(c, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=expand) 198(out, err) = p.communicate() 199return(p.returncode, out, err) 200 201defread_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. 205 """ 206(retcode, out, err) =read_pipe_full(c) 207if retcode !=0: 208if ignore_error: 209 out ="" 210else: 211die('Command failed:%s\nError:%s'% (str(c), err)) 212return out 213 214defread_pipe_text(c): 215""" Read output from a command with trailing whitespace stripped. 216 On error, returns None. 217 """ 218(retcode, out, err) =read_pipe_full(c) 219if retcode !=0: 220return None 221else: 222return out.rstrip() 223 224defp4_read_pipe(c, ignore_error=False): 225 real_cmd =p4_build_cmd(c) 226returnread_pipe(real_cmd, ignore_error) 227 228defread_pipe_lines(c): 229if verbose: 230 sys.stderr.write('Reading pipe:%s\n'%str(c)) 231 232 expand =isinstance(c, basestring) 233 p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand) 234 pipe = p.stdout 235 val = pipe.readlines() 236if pipe.close()or p.wait(): 237die('Command failed:%s'%str(c)) 238 239return val 240 241defp4_read_pipe_lines(c): 242"""Specifically invoke p4 on the command supplied. """ 243 real_cmd =p4_build_cmd(c) 244returnread_pipe_lines(real_cmd) 245 246defp4_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() 253return p.returncode ==0 254 255defp4_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.""" 260 261if notp4_has_command("move"): 262return 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 267if err.find("Invalid option") >=0: 268return False 269if err.find("disabled") >=0: 270return False 271# assume it failed because @... was invalid changelist 272return True 273 274defsystem(cmd, ignore_error=False): 275 expand =isinstance(cmd,basestring) 276if verbose: 277 sys.stderr.write("executing%s\n"%str(cmd)) 278 retcode = subprocess.call(cmd, shell=expand) 279if retcode and not ignore_error: 280raiseCalledProcessError(retcode, cmd) 281 282return retcode 283 284defp4_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) 289if retcode: 290raiseCalledProcessError(retcode, real_cmd) 291 292defdie_bad_access(s): 293die("failure accessing depot:{0}".format(s.rstrip())) 294 295defp4_check_access(min_expiration=1): 296""" Check if we can access Perforce - account still logged in 297 """ 298 results =p4CmdList(["login","-s"]) 299 300iflen(results) ==0: 301# should never get here: always get either some results, or a p4ExitCode 302assert("could not parse response from perforce") 303 304 result = results[0] 305 306if'p4ExitCode'in result: 307# p4 returned non-zero status, e.g. P4PORT invalid, or p4 not in path 308die_bad_access("could not run p4") 309 310 code = result.get("code") 311if not code: 312# we get here if we couldn't connect and there was nothing to unmarshal 313die_bad_access("could not connect") 314 315elif code =="stat": 316 expiry = result.get("TicketExpiration") 317if expiry: 318 expiry =int(expiry) 319if expiry > min_expiration: 320# ok to carry on 321return 322else: 323die_bad_access("perforce ticket expires in{0}seconds".format(expiry)) 324 325else: 326# account without a timeout - all ok 327return 328 329elif code =="error": 330 data = result.get("data") 331if data: 332die_bad_access("p4 error:{0}".format(data)) 333else: 334die_bad_access("unknown error") 335elif code =="info": 336return 337else: 338die_bad_access("unknown error code{0}".format(code)) 339 340_p4_version_string =None 341defp4_version_string(): 342"""Read the version string, showing just the last line, which 343 hopefully is the interesting version bit. 344 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). 349 """ 350global _p4_version_string 351if not _p4_version_string: 352 a =p4_read_pipe_lines(["-V"]) 353 _p4_version_string = a[-1].rstrip() 354return _p4_version_string 355 356defp4_integrate(src, dest): 357p4_system(["integrate","-Dt",wildcard_encode(src),wildcard_encode(dest)]) 358 359defp4_sync(f, *options): 360p4_system(["sync"] +list(options) + [wildcard_encode(f)]) 361 362defp4_add(f): 363# forcibly add file names with wildcards 364ifwildcard_present(f): 365p4_system(["add","-f", f]) 366else: 367p4_system(["add", f]) 368 369defp4_delete(f): 370p4_system(["delete",wildcard_encode(f)]) 371 372defp4_edit(f, *options): 373p4_system(["edit"] +list(options) + [wildcard_encode(f)]) 374 375defp4_revert(f): 376p4_system(["revert",wildcard_encode(f)]) 377 378defp4_reopen(type, f): 379p4_system(["reopen","-t",type,wildcard_encode(f)]) 380 381defp4_reopen_in_change(changelist, files): 382 cmd = ["reopen","-c",str(changelist)] + files 383p4_system(cmd) 384 385defp4_move(src, dest): 386p4_system(["move","-k",wildcard_encode(src),wildcard_encode(dest)]) 387 388defp4_last_change(): 389 results =p4CmdList(["changes","-m","1"], skip_info=True) 390returnint(results[0]['change']) 391 392defp4_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.""" 396 397 cmd = ["describe","-s"] 398if shelved: 399 cmd += ["-S"] 400 cmd += [str(change)] 401 402 ds =p4CmdList(cmd, skip_info=True) 403iflen(ds) !=1: 404die("p4 describe -s%ddid not return 1 result:%s"% (change,str(ds))) 405 406 d = ds[0] 407 408if"p4ExitCode"in d: 409die("p4 describe -s%dexited with%d:%s"% (change, d["p4ExitCode"], 410str(d))) 411if"code"in d: 412if d["code"] =="error": 413die("p4 describe -s%dreturned error code:%s"% (change,str(d))) 414 415if"time"not in d: 416die("p4 describe -s%dreturned no\"time\":%s"% (change,str(d))) 417 418return d 419 420# 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. 424# 425defsplit_p4_type(p4type): 426 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", 444} 445if p4type in p4_filetypes_historical: 446 p4type = p4_filetypes_historical[p4type] 447 mods ="" 448 s = p4type.split("+") 449 base = s[0] 450 mods ="" 451iflen(s) >1: 452 mods = s[1] 453return(base, mods) 454 455# 456# return the raw p4 type of a file (text, text+ko, etc) 457# 458defp4_type(f): 459 results =p4CmdList(["fstat","-T","headType",wildcard_encode(f)]) 460return results[0]['headType'] 461 462# 463# Given a type base and modifier, return a regexp matching 464# the keywords that can be expanded in the file 465# 466defp4_keywords_regexp_for_type(base, type_mods): 467if base in("text","unicode","binary"): 468 kwords =None 469if"ko"in type_mods: 470 kwords ='Id|Header' 471elif"k"in type_mods: 472 kwords ='Id|Header|Author|Date|DateTime|Change|File|Revision' 473else: 474return 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 481return pattern 482else: 483return None 484 485# 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. 489# 490defp4_keywords_regexp_for_file(file): 491if not os.path.exists(file): 492return None 493else: 494(type_base, type_mods) =split_p4_type(p4_type(file)) 495returnp4_keywords_regexp_for_type(type_base, type_mods) 496 497defsetP4ExecBit(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. 500 501 p4Type ="+x" 502 503if notisModeExec(mode): 504 p4Type =getP4OpenedType(file) 505 p4Type = re.sub('^([cku]?)x(.*)','\\1\\2', p4Type) 506 p4Type = re.sub('(.*?\+.*?)x(.*?)','\\1\\2', p4Type) 507if p4Type[-1] =="+": 508 p4Type = p4Type[0:-1] 509 510p4_reopen(p4Type,file) 511 512defgetP4OpenedType(file): 513# Returns the perforce file type for the given file. 514 515 result =p4_read_pipe(["opened",wildcard_encode(file)]) 516 match = re.match(".*\((.+)\)( \*exclusive\*)?\r?$", result) 517if match: 518return match.group(1) 519else: 520die("Could not determine file type for%s(result: '%s')"% (file, result)) 521 522# Return the set of all p4 labels 523defgetP4Labels(depotPaths): 524 labels =set() 525ifisinstance(depotPaths,basestring): 526 depotPaths = [depotPaths] 527 528for l inp4CmdList(["labels"] + ["%s..."% p for p in depotPaths]): 529 label = l['label'] 530 labels.add(label) 531 532return labels 533 534# Return the set of all git tags 535defgetGitTags(): 536 gitTags =set() 537for line inread_pipe_lines(["git","tag"]): 538 tag = line.strip() 539 gitTags.add(tag) 540return gitTags 541 542defdiffTreePattern(): 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(.*))|$)') 546while True: 547yield pattern 548 549defparseDiffTreeEntry(entry): 550"""Parses a single diff tree entry into its component elements. 551 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: 554 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. 565 566 If the pattern is not matched, None is returned.""" 567 568 match =diffTreePattern().next().match(entry) 569if match: 570return{ 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) 579} 580return None 581 582defisModeExec(mode): 583# Returns True if the given git mode represents an executable file, 584# otherwise False. 585return mode[-3:] =="755" 586 587classP4Exception(Exception): 588""" Base class for exceptions from the p4 client """ 589def__init__(self, exit_code): 590 self.p4ExitCode = exit_code 591 592classP4ServerException(P4Exception): 593""" Base class for exceptions where we get some kind of marshalled up result from the server """ 594def__init__(self, exit_code, p4_result): 595super(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'] 599 600classP4RequestSizeException(P4ServerException): 601""" One of the maxresults or maxscanrows errors """ 602def__init__(self, exit_code, p4_result, limit): 603super(P4RequestSizeException, self).__init__(exit_code, p4_result) 604 self.limit = limit 605 606defisModeExecChanged(src_mode, dst_mode): 607returnisModeExec(src_mode) !=isModeExec(dst_mode) 608 609defp4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False, 610 errors_as_exceptions=False): 611 612ifisinstance(cmd,basestring): 613 cmd ="-G "+ cmd 614 expand =True 615else: 616 cmd = ["-G"] + cmd 617 expand =False 618 619 cmd =p4_build_cmd(cmd) 620if verbose: 621 sys.stderr.write("Opening pipe:%s\n"%str(cmd)) 622 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 627if stdin is not None: 628 stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode) 629ifisinstance(stdin,basestring): 630 stdin_file.write(stdin) 631else: 632for i in stdin: 633 stdin_file.write(i +'\n') 634 stdin_file.flush() 635 stdin_file.seek(0) 636 637 p4 = subprocess.Popen(cmd, 638 shell=expand, 639 stdin=stdin_file, 640 stdout=subprocess.PIPE) 641 642 result = [] 643try: 644while True: 645 entry = marshal.load(p4.stdout) 646if skip_info: 647if'code'in entry and entry['code'] =='info': 648continue 649if cb is not None: 650cb(entry) 651else: 652 result.append(entry) 653exceptEOFError: 654pass 655 exitCode = p4.wait() 656if exitCode !=0: 657if errors_as_exceptions: 658iflen(result) >0: 659 data = result[0].get('data') 660if data: 661 m = re.search('Too many rows scanned \(over (\d+)\)', data) 662if not m: 663 m = re.search('Request too large \(over (\d+)\)', data) 664 665if m: 666 limit =int(m.group(1)) 667raiseP4RequestSizeException(exitCode, result, limit) 668 669raiseP4ServerException(exitCode, result) 670else: 671raiseP4Exception(exitCode) 672else: 673 entry = {} 674 entry["p4ExitCode"] = exitCode 675 result.append(entry) 676 677return result 678 679defp4Cmd(cmd): 680list=p4CmdList(cmd) 681 result = {} 682for entry inlist: 683 result.update(entry) 684return result; 685 686defp4Where(depotPath): 687if not depotPath.endswith("/"): 688 depotPath +="/" 689 depotPathLong = depotPath +"..." 690 outputList =p4CmdList(["where", depotPathLong]) 691 output =None 692for entry in outputList: 693if"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 "/...". 696if entry["depotFile"].find(depotPath) ==0and entry["depotFile"][-4:] =="/...": 697 output = entry 698break 699elif"data"in entry: 700 data = entry.get("data") 701 space = data.find(" ") 702if data[:space] == depotPath: 703 output = entry 704break 705if output ==None: 706return"" 707if output["code"] =="error": 708return"" 709 clientPath ="" 710if"path"in output: 711 clientPath = output.get("path") 712elif"data"in output: 713 data = output.get("data") 714 lastSpace = data.rfind(" ") 715 clientPath = data[lastSpace +1:] 716 717if clientPath.endswith("..."): 718 clientPath = clientPath[:-3] 719return clientPath 720 721defcurrentGitBranch(): 722returnread_pipe_text(["git","symbolic-ref","--short","-q","HEAD"]) 723 724defisValidGitDir(path): 725returngit_dir(path) !=None 726 727defparseRevision(ref): 728returnread_pipe("git rev-parse%s"% ref).strip() 729 730defbranchExists(ref): 731 rev =read_pipe(["git","rev-parse","-q","--verify", ref], 732 ignore_error=True) 733returnlen(rev) >0 734 735defextractLogMessageFromGitCommit(commit): 736 logMessage ="" 737 738## fixme: title is first line of commit, not 1st paragraph. 739 foundTitle =False 740for log inread_pipe_lines("git cat-file commit%s"% commit): 741if not foundTitle: 742iflen(log) ==1: 743 foundTitle =True 744continue 745 746 logMessage += log 747return logMessage 748 749defextractSettingsGitLog(log): 750 values = {} 751for line in log.split("\n"): 752 line = line.strip() 753 m = re.search(r"^ *\[git-p4: (.*)\]$", line) 754if not m: 755continue 756 757 assignments = m.group(1).split(':') 758for a in assignments: 759 vals = a.split('=') 760 key = vals[0].strip() 761 val = ('='.join(vals[1:])).strip() 762if val.endswith('\"')and val.startswith('"'): 763 val = val[1:-1] 764 765 values[key] = val 766 767 paths = values.get("depot-paths") 768if not paths: 769 paths = values.get("depot-path") 770if paths: 771 values['depot-paths'] = paths.split(',') 772return values 773 774defgitBranchExists(branch): 775 proc = subprocess.Popen(["git","rev-parse", branch], 776 stderr=subprocess.PIPE, stdout=subprocess.PIPE); 777return proc.wait() ==0; 778 779defgitUpdateRef(ref, newvalue): 780 subprocess.check_call(["git","update-ref", ref, newvalue]) 781 782defgitDeleteRef(ref): 783 subprocess.check_call(["git","update-ref","-d", ref]) 784 785_gitConfig = {} 786 787defgitConfig(key, typeSpecifier=None): 788if key not in _gitConfig: 789 cmd = ["git","config"] 790if typeSpecifier: 791 cmd += [ typeSpecifier ] 792 cmd += [ key ] 793 s =read_pipe(cmd, ignore_error=True) 794 _gitConfig[key] = s.strip() 795return _gitConfig[key] 796 797defgitConfigBool(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.""" 801 802if key not in _gitConfig: 803 _gitConfig[key] =gitConfig(key,'--bool') =="true" 804return _gitConfig[key] 805 806defgitConfigInt(key): 807if key not in _gitConfig: 808 cmd = ["git","config","--int", key ] 809 s =read_pipe(cmd, ignore_error=True) 810 v = s.strip() 811try: 812 _gitConfig[key] =int(gitConfig(key,'--int')) 813exceptValueError: 814 _gitConfig[key] =None 815return _gitConfig[key] 816 817defgitConfigList(key): 818if key not in _gitConfig: 819 s =read_pipe(["git","config","--get-all", key], ignore_error=True) 820 _gitConfig[key] = s.strip().splitlines() 821if _gitConfig[key] == ['']: 822 _gitConfig[key] = [] 823return _gitConfig[key] 824 825defp4BranchesInGit(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.""" 831 832 branches = {} 833 834 cmdline ="git rev-parse --symbolic " 835if branchesAreInRemotes: 836 cmdline +="--remotes" 837else: 838 cmdline +="--branches" 839 840for line inread_pipe_lines(cmdline): 841 line = line.strip() 842 843# only import to p4/ 844if not line.startswith('p4/'): 845continue 846# special symbolic ref to p4/master 847if line =="p4/HEAD": 848continue 849 850# strip off p4/ prefix 851 branch = line[len("p4/"):] 852 853 branches[branch] =parseRevision(line) 854 855return branches 856 857defbranch_exists(branch): 858"""Make sure that the given ref name really exists.""" 859 860 cmd = ["git","rev-parse","--symbolic","--verify", branch ] 861 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 862 out, _ = p.communicate() 863if p.returncode: 864return False 865# expect exactly one line of output: the branch name 866return out.rstrip() == branch 867 868deffindUpstreamBranchPoint(head ="HEAD"): 869 branches =p4BranchesInGit() 870# map from depot-path to branch name 871 branchByDepotPath = {} 872for branch in branches.keys(): 873 tip = branches[branch] 874 log =extractLogMessageFromGitCommit(tip) 875 settings =extractSettingsGitLog(log) 876if"depot-paths"in settings: 877 paths =",".join(settings["depot-paths"]) 878 branchByDepotPath[paths] ="remotes/p4/"+ branch 879 880 settings =None 881 parent =0 882while parent <65535: 883 commit = head +"~%s"% parent 884 log =extractLogMessageFromGitCommit(commit) 885 settings =extractSettingsGitLog(log) 886if"depot-paths"in settings: 887 paths =",".join(settings["depot-paths"]) 888if paths in branchByDepotPath: 889return[branchByDepotPath[paths], settings] 890 891 parent = parent +1 892 893return["", settings] 894 895defcreateOrUpdateBranchesFromOrigin(localRefPrefix ="refs/remotes/p4/", silent=True): 896if not silent: 897print("Creating/updating branch(es) in%sbased on origin branch(es)" 898% localRefPrefix) 899 900 originPrefix ="origin/p4/" 901 902for line inread_pipe_lines("git rev-parse --symbolic --remotes"): 903 line = line.strip() 904if(not line.startswith(originPrefix))or line.endswith("HEAD"): 905continue 906 907 headName = line[len(originPrefix):] 908 remoteHead = localRefPrefix + headName 909 originHead = line 910 911 original =extractSettingsGitLog(extractLogMessageFromGitCommit(originHead)) 912if('depot-paths'not in original 913or'change'not in original): 914continue 915 916 update =False 917if notgitBranchExists(remoteHead): 918if verbose: 919print("creating%s"% remoteHead) 920 update =True 921else: 922 settings =extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead)) 923if'change'in settings: 924if settings['depot-paths'] == original['depot-paths']: 925 originP4Change =int(original['change']) 926 p4Change =int(settings['change']) 927if originP4Change > p4Change: 928print("%s(%s) is newer than%s(%s). " 929"Updating p4 branch from origin." 930% (originHead, originP4Change, 931 remoteHead, p4Change)) 932 update =True 933else: 934print("Ignoring:%swas imported from%swhile " 935"%swas imported from%s" 936% (originHead,','.join(original['depot-paths']), 937 remoteHead,','.join(settings['depot-paths']))) 938 939if update: 940system("git update-ref%s %s"% (remoteHead, originHead)) 941 942deforiginP4BranchesExist(): 943returngitBranchExists("origin")orgitBranchExists("origin/p4")orgitBranchExists("origin/p4/master") 944 945 946defp4ParseNumericChangeRange(parts): 947 changeStart =int(parts[0][1:]) 948if parts[1] =='#head': 949 changeEnd =p4_last_change() 950else: 951 changeEnd =int(parts[1]) 952 953return(changeStart, changeEnd) 954 955defchooseBlockSize(blockSize): 956if blockSize: 957return blockSize 958else: 959return defaultBlockSize 960 961defp4ChangesForPaths(depotPaths, changeRange, requestedBlockSize): 962assert depotPaths 963 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. 969 970if changeRange is None or changeRange =='': 971 changeStart =1 972 changeEnd =p4_last_change() 973 block_size =chooseBlockSize(requestedBlockSize) 974else: 975 parts = changeRange.split(',') 976assertlen(parts) ==2 977try: 978(changeStart, changeEnd) =p4ParseNumericChangeRange(parts) 979 block_size =chooseBlockSize(requestedBlockSize) 980exceptValueError: 981 changeStart = parts[0][1:] 982 changeEnd = parts[1] 983if requestedBlockSize: 984die("cannot use --changes-block-size with non-numeric revisions") 985 block_size =None 986 987 changes =set() 988 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 992 993while True: 994 cmd = ['changes'] 995 996if block_size: 997 end =min(changeEnd, changeStart + block_size) 998 revisionRange ="%d,%d"% (changeStart, end) 999else:1000 revisionRange ="%s,%s"% (changeStart, changeEnd)10011002for p in depotPaths:1003 cmd += ["%s...@%s"% (p, revisionRange)]10041005# fetch the changes1006try:1007 result =p4CmdList(cmd, errors_as_exceptions=True)1008except P4RequestSizeException as e:1009if not block_size:1010 block_size = e.limit1011elif block_size > e.limit:1012 block_size = e.limit1013else:1014 block_size =max(2, block_size //2)10151016if verbose:print("block size error, retrying with block size{0}".format(block_size))1017continue1018except P4Exception as e:1019die('Error retrieving changes description ({0})'.format(e.p4ExitCode))10201021# Insert changes in chronological order1022for entry inreversed(result):1023if'change'not in entry:1024continue1025 changes.add(int(entry['change']))10261027if not block_size:1028break10291030if end >= changeEnd:1031break10321033 changeStart = end +110341035 changes =sorted(changes)1036return changes10371038defp4PathStartsWith(path, prefix):1039# This method tries to remedy a potential mixed-case issue:1040#1041# If UserA adds //depot/DirA/file11042# and UserB adds //depot/dira/file21043#1044# we may or may not have a problem. If you have core.ignorecase=true,1045# we treat DirA and dira as the same directory1046ifgitConfigBool("core.ignorecase"):1047return path.lower().startswith(prefix.lower())1048return path.startswith(prefix)10491050defgetClientSpec():1051"""Look at the p4 client spec, create a View() object that contains1052 all the mappings, and return it."""10531054 specList =p4CmdList("client -o")1055iflen(specList) !=1:1056die('Output from "client -o" is%dlines, expecting 1'%1057len(specList))10581059# dictionary of all client parameters1060 entry = specList[0]10611062# the //client/ name1063 client_name = entry["Client"]10641065# just the keys that start with "View"1066 view_keys = [ k for k in entry.keys()if k.startswith("View") ]10671068# hold this new View1069 view =View(client_name)10701071# append the lines, in order, to the view1072for view_num inrange(len(view_keys)):1073 k ="View%d"% view_num1074if k not in view_keys:1075die("Expected view key%smissing"% k)1076 view.append(entry[k])10771078return view10791080defgetClientRoot():1081"""Grab the client directory."""10821083 output =p4CmdList("client -o")1084iflen(output) !=1:1085die('Output from "client -o" is%dlines, expecting 1'%len(output))10861087 entry = output[0]1088if"Root"not in entry:1089die('Client has no "Root"')10901091return entry["Root"]10921093#1094# P4 wildcards are not allowed in filenames. P4 complains1095# if you simply add them, but you can force it with "-f", in1096# which case it translates them into %xx encoding internally.1097#1098defwildcard_decode(path):1099# Search for and fix just these four characters. Do % last so1100# that fixing it does not inadvertently create new %-escapes.1101# Cannot have * in a filename in windows; untested as to1102# what p4 would do in such a case.1103if not platform.system() =="Windows":1104 path = path.replace("%2A","*")1105 path = path.replace("%23","#") \1106.replace("%40","@") \1107.replace("%25","%")1108return path11091110defwildcard_encode(path):1111# do % first to avoid double-encoding the %s introduced here1112 path = path.replace("%","%25") \1113.replace("*","%2A") \1114.replace("#","%23") \1115.replace("@","%40")1116return path11171118defwildcard_present(path):1119 m = re.search("[*#@%]", path)1120return m is not None11211122classLargeFileSystem(object):1123"""Base class for large file system support."""11241125def__init__(self, writeToGitStream):1126 self.largeFiles =set()1127 self.writeToGitStream = writeToGitStream11281129defgeneratePointer(self, cloneDestination, contentFile):1130"""Return the content of a pointer file that is stored in Git instead of1131 the actual content."""1132assert False,"Method 'generatePointer' required in "+ self.__class__.__name__11331134defpushFile(self, localLargeFile):1135"""Push the actual content which is not stored in the Git repository to1136 a server."""1137assert False,"Method 'pushFile' required in "+ self.__class__.__name__11381139defhasLargeFileExtension(self, relPath):1140returnreduce(1141lambda a, b: a or b,1142[relPath.endswith('.'+ e)for e ingitConfigList('git-p4.largeFileExtensions')],1143False1144)11451146defgenerateTempFile(self, contents):1147 contentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=False)1148for d in contents:1149 contentFile.write(d)1150 contentFile.close()1151return contentFile.name11521153defexceedsLargeFileThreshold(self, relPath, contents):1154ifgitConfigInt('git-p4.largeFileThreshold'):1155 contentsSize =sum(len(d)for d in contents)1156if contentsSize >gitConfigInt('git-p4.largeFileThreshold'):1157return True1158ifgitConfigInt('git-p4.largeFileCompressedThreshold'):1159 contentsSize =sum(len(d)for d in contents)1160if contentsSize <=gitConfigInt('git-p4.largeFileCompressedThreshold'):1161return False1162 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_size1168 os.remove(contentTempFile)1169 os.remove(compressedContentFile.name)1170if compressedContentsSize >gitConfigInt('git-p4.largeFileCompressedThreshold'):1171return True1172return False11731174defaddLargeFile(self, relPath):1175 self.largeFiles.add(relPath)11761177defremoveLargeFile(self, relPath):1178 self.largeFiles.remove(relPath)11791180defisLargeFile(self, relPath):1181return relPath in self.largeFiles11821183defprocessContent(self, git_mode, relPath, contents):1184"""Processes the content of git fast import. This method decides if a1185 file is stored in the large file system and handles all necessary1186 steps."""1187if self.exceedsLargeFileThreshold(relPath, contents)or self.hasLargeFileExtension(relPath):1188 contentTempFile = self.generateTempFile(contents)1189(pointer_git_mode, contents, localLargeFile) = self.generatePointer(contentTempFile)1190if pointer_git_mode:1191 git_mode = pointer_git_mode1192if localLargeFile:1193# Move temp file to final location in large file system1194 largeFileDir = os.path.dirname(localLargeFile)1195if not os.path.isdir(largeFileDir):1196 os.makedirs(largeFileDir)1197 shutil.move(contentTempFile, localLargeFile)1198 self.addLargeFile(relPath)1199ifgitConfigBool('git-p4.largeFilePush'):1200 self.pushFile(localLargeFile)1201if verbose:1202 sys.stderr.write("%smoved to large file system (%s)\n"% (relPath, localLargeFile))1203return(git_mode, contents)12041205classMockLFS(LargeFileSystem):1206"""Mock large file system for testing."""12071208defgeneratePointer(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.1211 """1212withopen(contentFile,'r')as f:1213 content =next(f)1214 gitMode ='100644'1215 pointerContents ='pointer-'+ content1216 localLargeFile = os.path.join(os.getcwd(),'.git','mock-storage','local', content[:-1])1217return(gitMode, pointerContents, localLargeFile)12181219defpushFile(self, localLargeFile):1220"""The remote filename of the large file storage is the same as the local1221 one but in a different directory.1222 """1223 remotePath = os.path.join(os.path.dirname(localLargeFile),'..','remote')1224if not os.path.exists(remotePath):1225 os.makedirs(remotePath)1226 shutil.copyfile(localLargeFile, os.path.join(remotePath, os.path.basename(localLargeFile)))12271228classGitLFS(LargeFileSystem):1229"""Git LFS as backend for the git-p4 large file system.1230 See https://git-lfs.github.com/ for details."""12311232def__init__(self, *args):1233 LargeFileSystem.__init__(self, *args)1234 self.baseGitAttributes = []12351236defgeneratePointer(self, contentFile):1237"""Generate a Git LFS pointer for the content. Return LFS Pointer file1238 mode and content which is stored in the Git repository instead of1239 the actual content. Return also the new location of the actual1240 content.1241 """1242if os.path.getsize(contentFile) ==0:1243return(None,'',None)12441245 pointerProcess = subprocess.Popen(1246['git','lfs','pointer','--file='+ contentFile],1247 stdout=subprocess.PIPE1248)1249 pointerFile = pointerProcess.stdout.read()1250if pointerProcess.wait():1251 os.remove(contentFile)1252die('git-lfs pointer command failed. Did you install the extension?')12531254# Git LFS removed the preamble in the output of the 'pointer' command1255# starting from version 1.2.0. Check for the preamble here to support1256# earlier versions.1257# c.f. https://github.com/github/git-lfs/commit/da2935d9a739592bc775c98d8ef4df9c72ea3b431258if pointerFile.startswith('Git LFS pointer for'):1259 pointerFile = re.sub(r'Git LFS pointer for.*\n\n','', pointerFile)12601261 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,1266)1267# LFS Spec states that pointer files should not have the executable bit set.1268 gitMode ='100644'1269return(gitMode, pointerFile, localLargeFile)12701271defpushFile(self, localLargeFile):1272 uploadProcess = subprocess.Popen(1273['git','lfs','push','--object-id','origin', os.path.basename(localLargeFile)]1274)1275if uploadProcess.wait():1276die('git-lfs push command failed. Did you define a remote?')12771278defgenerateGitAttributes(self):1279return(1280 self.baseGitAttributes +1281[1282'\n',1283'#\n',1284'# Git LFS (see https://git-lfs.github.com/)\n',1285'#\n',1286] +1287['*.'+ f.replace(' ','[[:space:]]') +' filter=lfs diff=lfs merge=lfs -text\n'1288for f insorted(gitConfigList('git-p4.largeFileExtensions'))1289] +1290['/'+ f.replace(' ','[[:space:]]') +' filter=lfs diff=lfs merge=lfs -text\n'1291for f insorted(self.largeFiles)if not self.hasLargeFileExtension(f)1292]1293)12941295defaddLargeFile(self, relPath):1296 LargeFileSystem.addLargeFile(self, relPath)1297 self.writeToGitStream('100644','.gitattributes', self.generateGitAttributes())12981299defremoveLargeFile(self, relPath):1300 LargeFileSystem.removeLargeFile(self, relPath)1301 self.writeToGitStream('100644','.gitattributes', self.generateGitAttributes())13021303defprocessContent(self, git_mode, relPath, contents):1304if relPath =='.gitattributes':1305 self.baseGitAttributes = contents1306return(git_mode, self.generateGitAttributes())1307else:1308return LargeFileSystem.processContent(self, git_mode, relPath, contents)13091310class Command:1311 delete_actions = ("delete","move/delete","purge")1312 add_actions = ("add","move/add")13131314def__init__(self):1315 self.usage ="usage: %prog [options]"1316 self.needsGit =True1317 self.verbose =False13181319# This is required for the "append" cloneExclude action1320defensure_value(self, attr, value):1321if nothasattr(self, attr)orgetattr(self, attr)is None:1322setattr(self, attr, value)1323returngetattr(self, attr)13241325class P4UserMap:1326def__init__(self):1327 self.userMapFromPerforceServer =False1328 self.myP4UserId =None13291330defp4UserId(self):1331if self.myP4UserId:1332return self.myP4UserId13331334 results =p4CmdList("user -o")1335for r in results:1336if'User'in r:1337 self.myP4UserId = r['User']1338return r['User']1339die("Could not find your p4 user id")13401341defp4UserIsMe(self, p4User):1342# return True if the given p4 user is actually me1343 me = self.p4UserId()1344if not p4User or p4User != me:1345return False1346else:1347return True13481349defgetUserCacheFilename(self):1350 home = os.environ.get("HOME", os.environ.get("USERPROFILE"))1351return home +"/.gitp4-usercache.txt"13521353defgetUserMapFromPerforceServer(self):1354if self.userMapFromPerforceServer:1355return1356 self.users = {}1357 self.emails = {}13581359for output inp4CmdList("users"):1360if"User"not in output:1361continue1362 self.users[output["User"]] = output["FullName"] +" <"+ output["Email"] +">"1363 self.emails[output["Email"]] = output["User"]13641365 mapUserConfigRegex = re.compile(r"^\s*(\S+)\s*=\s*(.+)\s*<(\S+)>\s*$", re.VERBOSE)1366for mapUserConfig ingitConfigList("git-p4.mapUser"):1367 mapUser = mapUserConfigRegex.findall(mapUserConfig)1368if mapUser andlen(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] = user13741375 s =''1376for(key, val)in self.users.items():1377 s +="%s\t%s\n"% (key.expandtabs(1), val.expandtabs(1))13781379open(self.getUserCacheFilename(),"wb").write(s)1380 self.userMapFromPerforceServer =True13811382defloadUserMapFromCache(self):1383 self.users = {}1384 self.userMapFromPerforceServer =False1385try:1386 cache =open(self.getUserCacheFilename(),"rb")1387 lines = cache.readlines()1388 cache.close()1389for line in lines:1390 entry = line.strip().split("\t")1391 self.users[entry[0]] = entry[1]1392exceptIOError:1393 self.getUserMapFromPerforceServer()13941395classP4Debug(Command):1396def__init__(self):1397 Command.__init__(self)1398 self.options = []1399 self.description ="A tool to debug the output of p4 -G."1400 self.needsGit =False14011402defrun(self, args):1403 j =01404for output inp4CmdList(args):1405print('Element:%d'% j)1406 j +=11407print(output)1408return True14091410classP4RollBack(Command):1411def__init__(self):1412 Command.__init__(self)1413 self.options = [1414 optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true")1415]1416 self.description ="A tool to debug the multi-branch import. Don't use :)"1417 self.rollbackLocalBranches =False14181419defrun(self, args):1420iflen(args) !=1:1421return False1422 maxChange =int(args[0])14231424if"p4ExitCode"inp4Cmd("changes -m 1"):1425die("Problems executing p4");14261427if self.rollbackLocalBranches:1428 refPrefix ="refs/heads/"1429 lines =read_pipe_lines("git rev-parse --symbolic --branches")1430else:1431 refPrefix ="refs/remotes/"1432 lines =read_pipe_lines("git rev-parse --symbolic --remotes")14331434for line in lines:1435if self.rollbackLocalBranches or(line.startswith("p4/")and line !="p4/HEAD\n"):1436 line = line.strip()1437 ref = refPrefix + line1438 log =extractLogMessageFromGitCommit(ref)1439 settings =extractSettingsGitLog(log)14401441 depotPaths = settings['depot-paths']1442 change = settings['change']14431444 changed =False14451446iflen(p4Cmd("changes -m 1 "+' '.join(['%s...@%s'% (p, maxChange)1447for p in depotPaths]))) ==0:1448print("Branch%sdid not exist at change%s, deleting."% (ref, maxChange))1449system("git update-ref -d%s`git rev-parse%s`"% (ref, ref))1450continue14511452while change andint(change) > maxChange:1453 changed =True1454if self.verbose:1455print("%sis at%s; rewinding towards%s"% (ref, change, maxChange))1456system("git update-ref%s\"%s^\""% (ref, ref))1457 log =extractLogMessageFromGitCommit(ref)1458 settings =extractSettingsGitLog(log)145914601461 depotPaths = settings['depot-paths']1462 change = settings['change']14631464if changed:1465print("%srewound to%s"% (ref, change))14661467return True14681469classP4Submit(Command, P4UserMap):14701471 conflict_behavior_choices = ("ask","skip","quit")14721473def__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 permissions1480 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",1488help="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",1492help="update an existing shelved changelist, implies --shelve, "1493"repeat in-order for multiple shelved changelists"),1494 optparse.make_option("--commit", dest="commit", metavar="COMMIT",1495help="submit only the specified commit(s), one commit or xxx..xxx"),1496 optparse.make_option("--disable-rebase", dest="disable_rebase", action="store_true",1497help="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",1500help="Skip Perforce sync of p4/master after submit or shelve"),1501]1502 self.description ="""Submit changes from git to the perforce depot.\n1503 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 with1505 non-zero status from this script prevents `git-p4 submit` from launching.15061507 One usage scenario is to run unit tests in the hook."""15081509 self.usage +=" [name of git branch to submit into perforce depot]"1510 self.origin =""1511 self.detectRenames =False1512 self.preserveUser =gitConfigBool("git-p4.preserveUser")1513 self.dry_run =False1514 self.shelve =False1515 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 =False1520 self.conflict_behavior =None1521 self.isWindows = (platform.system() =="Windows")1522 self.exportLabels =False1523 self.p4HasMoveCommand =p4_has_move_command()1524 self.branch =None15251526ifgitConfig('git-p4.largeFileSystem'):1527die("Large file system not supported for git-p4 submit command. Please remove it from config.")15281529defcheck(self):1530iflen(p4CmdList("opened ...")) >0:1531die("You have files opened with perforce! Close them before starting the sync.")15321533defseparate_jobs_from_description(self, message):1534"""Extract and return a possible Jobs field in the commit1535 message. It goes into a separate section in the p4 change1536 specification.15371538 A jobs line starts with "Jobs:" and looks like a new field1539 in a form. Values are white-space separated on the same1540 line or on following lines that start with a tab.15411542 This does not parse and extract the full git commit message1543 like a p4 form. It just sees the Jobs: line as a marker1544 to pass everything from then on directly into the p4 form,1545 but outside the description section.15461547 Return a tuple (stripped log message, jobs string)."""15481549 m = re.search(r'^Jobs:', message, re.MULTILINE)1550if m is None:1551return(message,None)15521553 jobtext = message[m.start():]1554 stripped_message = message[:m.start()].rstrip()1555return(stripped_message, jobtext)15561557defprepareLogMessage(self, template, message, jobs):1558"""Edits the template returned from "p4 change -o" to insert1559 the message in the Description field, and the jobs text in1560 the Jobs field."""1561 result =""15621563 inDescriptionSection =False15641565for line in template.split("\n"):1566if line.startswith("#"):1567 result += line +"\n"1568continue15691570if inDescriptionSection:1571if line.startswith("Files:")or line.startswith("Jobs:"):1572 inDescriptionSection =False1573# insert Jobs section1574if jobs:1575 result += jobs +"\n"1576else:1577continue1578else:1579if line.startswith("Description:"):1580 inDescriptionSection =True1581 line +="\n"1582for messageLine in message.split("\n"):1583 line +="\t"+ messageLine +"\n"15841585 result += line +"\n"15861587return result15881589defpatchRCSKeywords(self,file, pattern):1590# Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern1591(handle, outFileName) = tempfile.mkstemp(dir='.')1592try:1593 outFile = os.fdopen(handle,"w+")1594 inFile =open(file,"r")1595 regexp = re.compile(pattern, re.VERBOSE)1596for 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 file1602 os.unlink(file)1603 shutil.move(outFileName,file)1604except:1605# cleanup our temporary file1606 os.unlink(outFileName)1607print("Failed to strip RCS keywords in%s"%file)1608raise16091610print("Patched up RCS keywords in%s"%file)16111612defp4UserForCommit(self,id):1613# Return the tuple (perforce user,git email) for a given git commit id1614 self.getUserMapFromPerforceServer()1615 gitEmail =read_pipe(["git","log","--max-count=1",1616"--format=%ae",id])1617 gitEmail = gitEmail.strip()1618if gitEmail not in self.emails:1619return(None,gitEmail)1620else:1621return(self.emails[gitEmail],gitEmail)16221623defcheckValidP4Users(self,commits):1624# check if any git authors cannot be mapped to p4 users1625foridin commits:1626(user,email) = self.p4UserForCommit(id)1627if not user:1628 msg ="Cannot find p4 user for email%sin commit%s."% (email,id)1629ifgitConfigBool("git-p4.allowMissingP4Users"):1630print("%s"% msg)1631else:1632die("Error:%s\nSet git-p4.allowMissingP4Users to true to allow this."% msg)16331634deflastP4Changelist(self):1635# Get back the last changelist number submitted in this client spec. This1636# then gets used to patch up the username in the change. If the same1637# client spec is being used by multiple processes then this might go1638# wrong.1639 results =p4CmdList("client -o")# find the current client1640 client =None1641for r in results:1642if'Client'in r:1643 client = r['Client']1644break1645if not client:1646die("could not get client spec")1647 results =p4CmdList(["changes","-c", client,"-m","1"])1648for r in results:1649if'change'in r:1650return r['change']1651die("Could not get changelist number for last submit - cannot patch up user details")16521653defmodifyChangelistUser(self, changelist, newUser):1654# fixup the user field of a changelist after it has been submitted.1655 changes =p4CmdList("change -o%s"% changelist)1656iflen(changes) !=1:1657die("Bad output from p4 change modifying%sto user%s"%1658(changelist, newUser))16591660 c = changes[0]1661if c['User'] == newUser:return# nothing to do1662 c['User'] = newUser1663input= marshal.dumps(c)16641665 result =p4CmdList("change -f -i", stdin=input)1666for r in result:1667if'code'in r:1668if r['code'] =='error':1669die("Could not modify user field of changelist%sto%s:%s"% (changelist, newUser, r['data']))1670if'data'in r:1671print("Updated user field for changelist%sto%s"% (changelist, newUser))1672return1673die("Could not modify user field of changelist%sto%s"% (changelist, newUser))16741675defcanChangeChangelists(self):1676# check to see if we have p4 admin or super-user permissions, either of1677# which are required to modify changelists.1678 results =p4CmdList(["protects", self.depotPath])1679for r in results:1680if'perm'in r:1681if r['perm'] =='admin':1682return11683if r['perm'] =='super':1684return11685return016861687defprepareSubmitTemplate(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 submission1690 template in original order, since a human might edit it.16911692 Remove lines in the Files section that show changes to files1693 outside the depot path we're committing into."""16941695[upstream, settings] =findUpstreamBranchPoint()16961697 template ="""\1698# A Perforce Change Specification.1699#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 added1710# to this changelist. You may delete files from this list.1711# (New changelists only.)1712"""1713 files_list = []1714 inFilesSection =False1715 change_entry =None1716 args = ['change','-o']1717if changelist:1718 args.append(str(changelist))1719for entry inp4CmdList(args):1720if'code'not in entry:1721continue1722if entry['code'] =='stat':1723 change_entry = entry1724break1725if not change_entry:1726die('Failed to decode output of p4 change -o')1727for key, value in change_entry.iteritems():1728if key.startswith('File'):1729if'depot-paths'in settings:1730if not[p for p in settings['depot-paths']1731ifp4PathStartsWith(value, p)]:1732continue1733else:1734if notp4PathStartsWith(value, self.depotPath):1735continue1736 files_list.append(value)1737continue1738# Output in the order expected by prepareLogMessage1739for key in['Change','Client','User','Status','Description','Jobs']:1740if key not in change_entry:1741continue1742 template +='\n'1743 template += key +':'1744if key =='Description':1745 template +='\n'1746for field_line in change_entry[key].splitlines():1747 template +='\t'+field_line+'\n'1748iflen(files_list) >0:1749 template +='\n'1750 template +='Files:\n'1751for path in files_list:1752 template +='\t'+path+'\n'1753return template17541755defedit_template(self, template_file):1756"""Invoke the editor to let the user change the submission1757 message. Return true if okay to continue with the submit."""17581759# if configured to skip the editing part, just submit1760ifgitConfigBool("git-p4.skipSubmitEdit"):1761return True17621763# look at the modification time, to check later if the user saved1764# the file1765 mtime = os.stat(template_file).st_mtime17661767# invoke the editor1768if"P4EDITOR"in os.environ and(os.environ.get("P4EDITOR") !=""):1769 editor = os.environ.get("P4EDITOR")1770else:1771 editor =read_pipe("git var GIT_EDITOR").strip()1772system(["sh","-c", ('%s"$@"'% editor), editor, template_file])17731774# If the file was not saved, prompt to see if this patch should1775# be skipped. But skip this verification step if configured so.1776ifgitConfigBool("git-p4.skipSubmitEditCheck"):1777return True17781779# modification time updated means user saved the file1780if os.stat(template_file).st_mtime > mtime:1781return True17821783while True:1784 response =raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")1785if response =='y':1786return True1787if response =='n':1788return False17891790defget_diff_description(self, editedFiles, filesToAdd, symlinks):1791# diff1792if"P4DIFF"in os.environ:1793del(os.environ["P4DIFF"])1794 diff =""1795for editedFile in editedFiles:1796 diff +=p4_read_pipe(['diff','-du',1797wildcard_encode(editedFile)])17981799# new file diff1800 newdiff =""1801for newFile in filesToAdd:1802 newdiff +="==== new file ====\n"1803 newdiff +="--- /dev/null\n"1804 newdiff +="+++%s\n"% newFile18051806 is_link = os.path.islink(newFile)1807 expect_link = newFile in symlinks18081809if is_link and expect_link:1810 newdiff +="+%s\n"% os.readlink(newFile)1811else:1812 f =open(newFile,"r")1813for line in f.readlines():1814 newdiff +="+"+ line1815 f.close()18161817return(diff + newdiff).replace('\r\n','\n')18181819defapplyCommit(self,id):1820"""Apply one commit, return True if it succeeded."""18211822print("Applying",read_pipe(["git","show","-s",1823"--format=format:%h%s",id]))18241825(p4User, gitEmail) = self.p4UserForCommit(id)18261827 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()18361837for line in diff:1838 diff =parseDiffTreeEntry(line)1839 modifier = diff['status']1840 path = diff['src']1841 all_files.append(path)18421843if modifier =="M":1844p4_edit(path)1845ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1846 filesToChangeExecBit[path] = diff['dst_mode']1847 editedFiles.add(path)1848elif modifier =="A":1849 filesToAdd.add(path)1850 filesToChangeExecBit[path] = diff['dst_mode']1851if path in filesToDelete:1852 filesToDelete.remove(path)18531854 dst_mode =int(diff['dst_mode'],8)1855if dst_mode ==0o120000:1856 symlinks.add(path)18571858elif modifier =="D":1859 filesToDelete.add(path)1860if path in filesToAdd:1861 filesToAdd.remove(path)1862elif modifier =="C":1863 src, dest = diff['src'], diff['dst']1864p4_integrate(src, dest)1865 pureRenameCopy.add(dest)1866if diff['src_sha1'] != diff['dst_sha1']:1867p4_edit(dest)1868 pureRenameCopy.discard(dest)1869ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1870p4_edit(dest)1871 pureRenameCopy.discard(dest)1872 filesToChangeExecBit[dest] = diff['dst_mode']1873if self.isWindows:1874# turn off read-only attribute1875 os.chmod(dest, stat.S_IWRITE)1876 os.unlink(dest)1877 editedFiles.add(dest)1878elif modifier =="R":1879 src, dest = diff['src'], diff['dst']1880if self.p4HasMoveCommand:1881p4_edit(src)# src must be open before move1882p4_move(src, dest)# opens for (move/delete, move/add)1883else:1884p4_integrate(src, dest)1885if diff['src_sha1'] != diff['dst_sha1']:1886p4_edit(dest)1887else:1888 pureRenameCopy.add(dest)1889ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1890if not self.p4HasMoveCommand:1891p4_edit(dest)# with move: already open, writable1892 filesToChangeExecBit[dest] = diff['dst_mode']1893if not self.p4HasMoveCommand:1894if self.isWindows:1895 os.chmod(dest, stat.S_IWRITE)1896 os.unlink(dest)1897 filesToDelete.add(src)1898 editedFiles.add(dest)1899elif modifier =="T":1900 filesToChangeType.add(path)1901else:1902die("unknown modifier%sfor%s"% (modifier, path))19031904 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 =True19091910if os.system(tryPatchCmd) !=0:1911 fixed_rcs_keywords =False1912 patch_succeeded =False1913print("Unfortunately applying the change failed!")19141915# Patch failed, maybe it's just RCS keyword woes. Look through1916# the patch to see if that's possible.1917ifgitConfigBool("git-p4.attemptRCSCleanup"):1918file=None1919 pattern =None1920 kwfiles = {}1921forfilein editedFiles | filesToDelete:1922# did this file's delta contain RCS keywords?1923 pattern =p4_keywords_regexp_for_file(file)19241925if pattern:1926# this file is a possibility...look for RCS keywords.1927 regexp = re.compile(pattern, re.VERBOSE)1928for line inread_pipe_lines(["git","diff","%s^..%s"% (id,id),file]):1929if regexp.search(line):1930if verbose:1931print("got keyword match on%sin%sin%s"% (pattern, line,file))1932 kwfiles[file] = pattern1933break19341935forfilein kwfiles:1936if verbose:1937print("zapping%swith%s"% (line,pattern))1938# File is being deleted, so not open in p4. Must1939# disable the read-only bit on windows.1940if self.isWindows andfilenot in editedFiles:1941 os.chmod(file, stat.S_IWRITE)1942 self.patchRCSKeywords(file, kwfiles[file])1943 fixed_rcs_keywords =True19441945if fixed_rcs_keywords:1946print("Retrying the patch with RCS keywords cleaned up")1947if os.system(tryPatchCmd) ==0:1948 patch_succeeded =True19491950if not patch_succeeded:1951for f in editedFiles:1952p4_revert(f)1953return False19541955#1956# Apply the patch for real, and do add/delete/+x handling.1957#1958system(applyPatchCmd)19591960for f in filesToChangeType:1961p4_edit(f,"-t","auto")1962for f in filesToAdd:1963p4_add(f)1964for f in filesToDelete:1965p4_revert(f)1966p4_delete(f)19671968# Set/clear executable bits1969for f in filesToChangeExecBit.keys():1970 mode = filesToChangeExecBit[f]1971setP4ExecBit(f, mode)19721973 update_shelve =01974iflen(self.update_shelve) >0:1975 update_shelve = self.update_shelve.pop(0)1976p4_reopen_in_change(update_shelve, all_files)19771978#1979# Build p4 change description, starting with the contents1980# of the git commit message.1981#1982 logMessage =extractLogMessageFromGitCommit(id)1983 logMessage = logMessage.strip()1984(logMessage, jobs) = self.separate_jobs_from_description(logMessage)19851986 template = self.prepareSubmitTemplate(update_shelve)1987 submitTemplate = self.prepareLogMessage(template, logMessage, jobs)19881989if self.preserveUser:1990 submitTemplate +="\n######## Actual user%s, modified after commit\n"% p4User19911992if self.checkAuthorship and not self.p4UserIsMe(p4User):1993 submitTemplate +="######## git author%sdoes not match your p4 account.\n"% gitEmail1994 submitTemplate +="######## Use option --preserve-user to modify authorship.\n"1995 submitTemplate +="######## Variable git-p4.skipUserNameCheck hides this message.\n"19961997 separatorLine ="######## everything below this line is just the diff #######\n"1998if not self.prepare_p4_only:1999 submitTemplate += separatorLine2000 submitTemplate += self.get_diff_description(editedFiles, filesToAdd, symlinks)20012002(handle, fileName) = tempfile.mkstemp()2003 tmpFile = os.fdopen(handle,"w+b")2004if self.isWindows:2005 submitTemplate = submitTemplate.replace("\n","\r\n")2006 tmpFile.write(submitTemplate)2007 tmpFile.close()20082009if self.prepare_p4_only:2010#2011# Leave the p4 tree prepared, and the submit template around2012# and let the user decide what to do next2013#2014print()2015print("P4 workspace prepared for submission.")2016print("To submit or revert, go to client workspace")2017print(" "+ self.clientPath)2018print()2019print("To submit, use\"p4 submit\"to write a new description,")2020print("or\"p4 submit -i <%s\"to use the one prepared by" \2021"\"git p4\"."% fileName)2022print("You can delete the file\"%s\"when finished."% fileName)20232024if self.preserveUser and p4User and not self.p4UserIsMe(p4User):2025print("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.")2028if pureRenameCopy:2029print("After submitting, renamed files must be re-synced.")2030print("Invoke\"p4 sync -f\"on each of these files:")2031for f in pureRenameCopy:2032print(" "+ f)20332034print()2035print("To revert the changes, use\"p4 revert ...\", and delete")2036print("the submit template file\"%s\""% fileName)2037if filesToAdd:2038print("Since the commit adds new files, they must be deleted:")2039for f in filesToAdd:2040print(" "+ f)2041print()2042return True20432044#2045# Let the user edit the change description, then submit it.2046#2047 submitted =False20482049try:2050if self.edit_template(fileName):2051# read the edited message and submit2052 tmpFile =open(fileName,"rb")2053 message = tmpFile.read()2054 tmpFile.close()2055if self.isWindows:2056 message = message.replace("\r\n","\n")2057 submitTemplate = message[:message.index(separatorLine)]20582059if update_shelve:2060p4_write_pipe(['shelve','-r','-i'], submitTemplate)2061elif self.shelve:2062p4_write_pipe(['shelve','-i'], submitTemplate)2063else:2064p4_write_pipe(['submit','-i'], submitTemplate)2065# The rename/copy happened by applying a patch that created a2066# new file. This leaves it writable, which confuses p4.2067for f in pureRenameCopy:2068p4_sync(f,"-f")20692070if self.preserveUser:2071if p4User:2072# Get last changelist number. Cannot easily get it from2073# the submit command output as the output is2074# unmarshalled.2075 changelist = self.lastP4Changelist()2076 self.modifyChangelistUser(changelist, p4User)20772078 submitted =True20792080finally:2081# skip this patch2082if not submitted or self.shelve:2083if self.shelve:2084print("Reverting shelved files.")2085else:2086print("Submission cancelled, undoing p4 changes.")2087for f in editedFiles | filesToDelete:2088p4_revert(f)2089for f in filesToAdd:2090p4_revert(f)2091 os.remove(f)20922093 os.remove(fileName)2094return submitted20952096# Export git tags as p4 labels. Create a p4 label and then tag2097# with that.2098defexportGitTags(self, gitTags):2099 validLabelRegexp =gitConfig("git-p4.labelExportRegexp")2100iflen(validLabelRegexp) ==0:2101 validLabelRegexp = defaultLabelRegexp2102 m = re.compile(validLabelRegexp)21032104for name in gitTags:21052106if not m.match(name):2107if verbose:2108print("tag%sdoes not match regexp%s"% (name, validLabelRegexp))2109continue21102111# Get the p4 commit this corresponds to2112 logMessage =extractLogMessageFromGitCommit(name)2113 values =extractSettingsGitLog(logMessage)21142115if'change'not in values:2116# a tag pointing to something not sent to p4; ignore2117if verbose:2118print("git tag%sdoes not give a p4 commit"% name)2119continue2120else:2121 changelist = values['change']21222123# Get the tag details.2124 inHeader =True2125 isAnnotated =False2126 body = []2127for l inread_pipe_lines(["git","cat-file","-p", name]):2128 l = l.strip()2129if inHeader:2130if re.match(r'tag\s+', l):2131 isAnnotated =True2132elif re.match(r'\s*$', l):2133 inHeader =False2134continue2135else:2136 body.append(l)21372138if not isAnnotated:2139 body = ["lightweight tag imported by git p4\n"]21402141# Create the label - use the same view as the client spec we are using2142 clientSpec =getClientSpec()21432144 labelTemplate ="Label:%s\n"% name2145 labelTemplate +="Description:\n"2146for b in body:2147 labelTemplate +="\t"+ b +"\n"2148 labelTemplate +="View:\n"2149for depot_side in clientSpec.mappings:2150 labelTemplate +="\t%s\n"% depot_side21512152if self.dry_run:2153print("Would create p4 label%sfor tag"% name)2154elif self.prepare_p4_only:2155print("Not creating p4 label%sfor tag due to option" \2156" --prepare-p4-only"% name)2157else:2158p4_write_pipe(["label","-i"], labelTemplate)21592160# Use the label2161p4_system(["tag","-l", name] +2162["%s@%s"% (depot_side, changelist)for depot_side in clientSpec.mappings])21632164if verbose:2165print("created p4 label for tag%s"% name)21662167defrun(self, args):2168iflen(args) ==0:2169 self.master =currentGitBranch()2170eliflen(args) ==1:2171 self.master = args[0]2172if notbranchExists(self.master):2173die("Branch%sdoes not exist"% self.master)2174else:2175return False21762177for i in self.update_shelve:2178if i <=0:2179 sys.exit("invalid changelist%d"% i)21802181if self.master:2182 allowSubmit =gitConfig("git-p4.allowSubmit")2183iflen(allowSubmit) >0and not self.master in allowSubmit.split(","):2184die("%sis not in git-p4.allowSubmit"% self.master)21852186[upstream, settings] =findUpstreamBranchPoint()2187 self.depotPath = settings['depot-paths'][0]2188iflen(self.origin) ==0:2189 self.origin = upstream21902191iflen(self.update_shelve) >0:2192 self.shelve =True21932194if self.preserveUser:2195if not self.canChangeChangelists():2196die("Cannot preserve user names without p4 super-user or admin permissions")21972198# if not set from the command line, try the config file2199if self.conflict_behavior is None:2200 val =gitConfig("git-p4.conflict")2201if val:2202if val not in self.conflict_behavior_choices:2203die("Invalid value '%s' for config git-p4.conflict"% val)2204else:2205 val ="ask"2206 self.conflict_behavior = val22072208if self.verbose:2209print("Origin branch is "+ self.origin)22102211iflen(self.depotPath) ==0:2212print("Internal error: cannot locate perforce depot path from existing branches")2213 sys.exit(128)22142215 self.useClientSpec =False2216ifgitConfigBool("git-p4.useclientspec"):2217 self.useClientSpec =True2218if self.useClientSpec:2219 self.clientSpecDirs =getClientSpec()22202221# Check for the existence of P4 branches2222 branchesDetected = (len(p4BranchesInGit().keys()) >1)22232224if self.useClientSpec and not branchesDetected:2225# all files are relative to the client spec2226 self.clientPath =getClientRoot()2227else:2228 self.clientPath =p4Where(self.depotPath)22292230if self.clientPath =="":2231die("Error: Cannot locate perforce checkout of%sin client view"% self.depotPath)22322233print("Perforce checkout for depot path%slocated at%s"% (self.depotPath, self.clientPath))2234 self.oldWorkingDirectory = os.getcwd()22352236# ensure the clientPath exists2237 new_client_dir =False2238if not os.path.exists(self.clientPath):2239 new_client_dir =True2240 os.makedirs(self.clientPath)22412242chdir(self.clientPath, is_client_path=True)2243if self.dry_run:2244print("Would synchronize p4 checkout in%s"% self.clientPath)2245else:2246print("Synchronizing p4 checkout...")2247if new_client_dir:2248# old one was destroyed, and maybe nobody told p42249p4_sync("...","-f")2250else:2251p4_sync("...")2252 self.check()22532254 commits = []2255if self.master:2256 committish = self.master2257else:2258 committish ='HEAD'22592260if self.commit !="":2261if self.commit.find("..") != -1:2262 limits_ish = self.commit.split("..")2263for line inread_pipe_lines(["git","rev-list","--no-merges","%s..%s"% (limits_ish[0], limits_ish[1])]):2264 commits.append(line.strip())2265 commits.reverse()2266else:2267 commits.append(self.commit)2268else:2269for line inread_pipe_lines(["git","rev-list","--no-merges","%s..%s"% (self.origin, committish)]):2270 commits.append(line.strip())2271 commits.reverse()22722273if self.preserveUser orgitConfigBool("git-p4.skipUserNameCheck"):2274 self.checkAuthorship =False2275else:2276 self.checkAuthorship =True22772278if self.preserveUser:2279 self.checkValidP4Users(commits)22802281#2282# Build up a set of options to be passed to diff when2283# submitting each commit to p4.2284#2285if self.detectRenames:2286# command-line -M arg2287 self.diffOpts ="-M"2288else:2289# If not explicitly set check the config variable2290 detectRenames =gitConfig("git-p4.detectRenames")22912292if detectRenames.lower() =="false"or detectRenames =="":2293 self.diffOpts =""2294elif detectRenames.lower() =="true":2295 self.diffOpts ="-M"2296else:2297 self.diffOpts ="-M%s"% detectRenames22982299# no command-line arg for -C or --find-copies-harder, just2300# config variables2301 detectCopies =gitConfig("git-p4.detectCopies")2302if detectCopies.lower() =="false"or detectCopies =="":2303pass2304elif detectCopies.lower() =="true":2305 self.diffOpts +=" -C"2306else:2307 self.diffOpts +=" -C%s"% detectCopies23082309ifgitConfigBool("git-p4.detectCopiesHarder"):2310 self.diffOpts +=" --find-copies-harder"23112312 num_shelves =len(self.update_shelve)2313if num_shelves >0and num_shelves !=len(commits):2314 sys.exit("number of commits (%d) must match number of shelved changelist (%d)"%2315(len(commits), num_shelves))23162317 hooks_path =gitConfig("core.hooksPath")2318iflen(hooks_path) <=0:2319 hooks_path = os.path.join(os.environ.get("GIT_DIR",".git"),"hooks")23202321 hook_file = os.path.join(hooks_path,"p4-pre-submit")2322if os.path.isfile(hook_file)and os.access(hook_file, os.X_OK)and subprocess.call([hook_file]) !=0:2323 sys.exit(1)23242325#2326# Apply the commits, one at a time. On failure, ask if should2327# continue to try the rest of the patches, or quit.2328#2329if self.dry_run:2330print("Would apply")2331 applied = []2332 last =len(commits) -12333for i, commit inenumerate(commits):2334if self.dry_run:2335print(" ",read_pipe(["git","show","-s",2336"--format=format:%h%s", commit]))2337 ok =True2338else:2339 ok = self.applyCommit(commit)2340if ok:2341 applied.append(commit)2342else:2343if self.prepare_p4_only and i < last:2344print("Processing only the first commit due to option" \2345" --prepare-p4-only")2346break2347if i < last:2348 quit =False2349while True:2350# prompt for what to do, or use the option/variable2351if self.conflict_behavior =="ask":2352print("What do you want to do?")2353 response =raw_input("[s]kip this commit but apply"2354" the rest, or [q]uit? ")2355if not response:2356continue2357elif self.conflict_behavior =="skip":2358 response ="s"2359elif self.conflict_behavior =="quit":2360 response ="q"2361else:2362die("Unknown conflict_behavior '%s'"%2363 self.conflict_behavior)23642365if response[0] =="s":2366print("Skipping this commit, but applying the rest")2367break2368if response[0] =="q":2369print("Quitting")2370 quit =True2371break2372if quit:2373break23742375chdir(self.oldWorkingDirectory)2376 shelved_applied ="shelved"if self.shelve else"applied"2377if self.dry_run:2378pass2379elif self.prepare_p4_only:2380pass2381eliflen(commits) ==len(applied):2382print("All commits{0}!".format(shelved_applied))23832384 sync =P4Sync()2385if self.branch:2386 sync.branch = self.branch2387if self.disable_p4sync:2388 sync.sync_origin_only()2389else:2390 sync.run([])23912392if not self.disable_rebase:2393 rebase =P4Rebase()2394 rebase.rebase()23952396else:2397iflen(applied) ==0:2398print("No commits{0}.".format(shelved_applied))2399else:2400print("{0}only the commits marked with '*':".format(shelved_applied.capitalize()))2401for c in commits:2402if c in applied:2403 star ="*"2404else:2405 star =" "2406print(star,read_pipe(["git","show","-s",2407"--format=format:%h%s", c]))2408print("You will have to do 'git p4 sync' and rebase.")24092410ifgitConfigBool("git-p4.exportLabels"):2411 self.exportLabels =True24122413if self.exportLabels:2414 p4Labels =getP4Labels(self.depotPath)2415 gitTags =getGitTags()24162417 missingGitTags = gitTags - p4Labels2418 self.exportGitTags(missingGitTags)24192420# exit with error unless everything applied perfectly2421iflen(commits) !=len(applied):2422 sys.exit(1)24232424return True24252426classView(object):2427"""Represent a p4 view ("p4 help views"), and map files in a2428 repo according to the view."""24292430def__init__(self, client_name):2431 self.mappings = []2432 self.client_prefix ="//%s/"% client_name2433# cache results of "p4 where" to lookup client file locations2434 self.client_spec_path_cache = {}24352436defappend(self, view_line):2437"""Parse a view line, splitting it into depot and client2438 sides. Append to self.mappings, preserving order. This2439 is only needed for tag creation."""24402441# Split the view line into exactly two words. P4 enforces2442# structure on these lines that simplifies this quite a bit.2443#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.2451#2452if view_line[0] =='"':2453# First word is double quoted. Find its end.2454 close_quote_index = view_line.find('"',1)2455if close_quote_index <=0:2456die("No first-word closing quote found:%s"% view_line)2457 depot_side = view_line[1:close_quote_index]2458# skip closing quote and space2459 rhs_index = close_quote_index +1+12460else:2461 space_index = view_line.find(" ")2462if space_index <=0:2463die("No word-splitting space found:%s"% view_line)2464 depot_side = view_line[0:space_index]2465 rhs_index = space_index +124662467# prefix + means overlay on previous mapping2468if depot_side.startswith("+"):2469 depot_side = depot_side[1:]24702471# prefix - means exclude this path, leave out of mappings2472 exclude =False2473if depot_side.startswith("-"):2474 exclude =True2475 depot_side = depot_side[1:]24762477if not exclude:2478 self.mappings.append(depot_side)24792480defconvert_client_path(self, clientFile):2481# chop off //client/ part to make it relative2482if not clientFile.startswith(self.client_prefix):2483die("No prefix '%s' on clientFile '%s'"%2484(self.client_prefix, clientFile))2485return clientFile[len(self.client_prefix):]24862487defupdate_client_spec_path_cache(self, files):2488""" Caching file paths by "p4 where" batch query """24892490# List depot file paths exclude that already cached2491 fileArgs = [f['path']for f in files if f['path']not in self.client_spec_path_cache]24922493iflen(fileArgs) ==0:2494return# All files in cache24952496 where_result =p4CmdList(["-x","-","where"], stdin=fileArgs)2497for res in where_result:2498if"code"in res and res["code"] =="error":2499# assume error is "... file(s) not in client view"2500continue2501if"clientFile"not in res:2502die("No clientFile in 'p4 where' output")2503if"unmap"in res:2504# it will list all of them, but only one not unmap-ped2505continue2506ifgitConfigBool("core.ignorecase"):2507 res['depotFile'] = res['depotFile'].lower()2508 self.client_spec_path_cache[res['depotFile']] = self.convert_client_path(res["clientFile"])25092510# not found files or unmap files set to ""2511for depotFile in fileArgs:2512ifgitConfigBool("core.ignorecase"):2513 depotFile = depotFile.lower()2514if depotFile not in self.client_spec_path_cache:2515 self.client_spec_path_cache[depotFile] =""25162517defmap_in_client(self, depot_path):2518"""Return the relative location in the client where this2519 depot file should live. Returns "" if the file should2520 not be mapped in the client."""25212522ifgitConfigBool("core.ignorecase"):2523 depot_path = depot_path.lower()25242525if depot_path in self.client_spec_path_cache:2526return self.client_spec_path_cache[depot_path]25272528die("Error:%sis not found in client spec path"% depot_path )2529return""25302531classP4Sync(Command, P4UserMap):25322533def__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",2544help="Import into refs/heads/ , not refs/remotes"),2545 optparse.make_option("--max-changes", dest="maxChanges",2546help="Maximum number of changes to import"),2547 optparse.make_option("--changes-block-size", dest="changes_block_size",type="int",2548help="Internal block size to use when iteratively calling p4 changes"),2549 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',2550help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),2551 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',2552help="Only sync files that are included in the Perforce Client Spec"),2553 optparse.make_option("-/", dest="cloneExclude",2554 action="append",type="string",2555help="exclude depot path"),2556]2557 self.description ="""Imports from Perforce into a git repository.\n2558 example:2559 //depot/my/project/ -- to import the current head2560 //depot/my/project/@all -- to import everything2561 //depot/my/project/@1,6 -- to import only from revision 1 to 625622563 (a ... is not needed in the path p4 specification, it's added implicitly)"""25642565 self.usage +=" //depot/path[@revRange]"2566 self.silent =False2567 self.createdBranches =set()2568 self.committedChanges =set()2569 self.branch =""2570 self.detectBranches =False2571 self.detectLabels =False2572 self.importLabels =False2573 self.changesFile =""2574 self.syncWithOrigin =True2575 self.importIntoRemotes =True2576 self.maxChanges =""2577 self.changes_block_size =None2578 self.keepRepoPath =False2579 self.depotPaths =None2580 self.p4BranchesInGit = []2581 self.cloneExclude = []2582 self.useClientSpec =False2583 self.useClientSpec_from_options =False2584 self.clientSpecDirs =None2585 self.tempBranches = []2586 self.tempBranchLocation ="refs/git-p4-tmp"2587 self.largeFileSystem =None2588 self.suppress_meta_comment =False25892590ifgitConfig('git-p4.largeFileSystem'):2591 largeFileSystemConstructor =globals()[gitConfig('git-p4.largeFileSystem')]2592 self.largeFileSystem =largeFileSystemConstructor(2593lambda git_mode, relPath, contents: self.writeToGitStream(git_mode, relPath, contents)2594)25952596ifgitConfig("git-p4.syncFromOrigin") =="false":2597 self.syncWithOrigin =False25982599 self.depotPaths = []2600 self.changeRange =""2601 self.previousDepotPaths = []2602 self.hasOrigin =False26032604# map from branch depot path to parent branch2605 self.knownBranches = {}2606 self.initialParents = {}26072608 self.tz ="%+03d%02d"% (- time.timezone /3600, ((- time.timezone %3600) /60))2609 self.labels = {}26102611# Force a checkpoint in fast-import and wait for it to finish2612defcheckpoint(self):2613 self.gitStream.write("checkpoint\n\n")2614 self.gitStream.write("progress checkpoint\n\n")2615 out = self.gitOutput.readline()2616if self.verbose:2617print("checkpoint finished: "+ out)26182619defextractFilesFromCommit(self, commit, shelved=False, shelved_cl =0):2620 self.cloneExclude = [re.sub(r"\.\.\.$","", path)2621for path in self.cloneExclude]2622 files = []2623 fnum =02624while"depotFile%s"% fnum in commit:2625 path = commit["depotFile%s"% fnum]26262627if[p for p in self.cloneExclude2628ifp4PathStartsWith(path, p)]:2629 found =False2630else:2631 found = [p for p in self.depotPaths2632ifp4PathStartsWith(path, p)]2633if not found:2634 fnum = fnum +12635continue26362637file= {}2638file["path"] = path2639file["rev"] = commit["rev%s"% fnum]2640file["action"] = commit["action%s"% fnum]2641file["type"] = commit["type%s"% fnum]2642if shelved:2643file["shelved_cl"] =int(shelved_cl)2644 files.append(file)2645 fnum = fnum +12646return files26472648defextractJobsFromCommit(self, commit):2649 jobs = []2650 jnum =02651while"job%s"% jnum in commit:2652 job = commit["job%s"% jnum]2653 jobs.append(job)2654 jnum = jnum +12655return jobs26562657defstripRepoPath(self, path, prefixes):2658"""When streaming files, this is called to map a p4 depot path2659 to where it should go in git. The prefixes are either2660 self.depotPaths, or self.branchPrefixes in the case of2661 branch detection."""26622663if self.useClientSpec:2664# branch detection moves files up a level (the branch name)2665# from what client spec interpretation gives2666 path = self.clientSpecDirs.map_in_client(path)2667if self.detectBranches:2668for b in self.knownBranches:2669if path.startswith(b +"/"):2670 path = path[len(b)+1:]26712672elif self.keepRepoPath:2673# Preserve everything in relative path name except leading2674# //depot/; just look at first prefix as they all should2675# be in the same depot.2676 depot = re.sub("^(//[^/]+/).*", r'\1', prefixes[0])2677ifp4PathStartsWith(path, depot):2678 path = path[len(depot):]26792680else:2681for p in prefixes:2682ifp4PathStartsWith(path, p):2683 path = path[len(p):]2684break26852686 path =wildcard_decode(path)2687return path26882689defsplitFilesIntoBranches(self, commit):2690"""Look at each depotFile in the commit to figure out to what2691 branch it belongs."""26922693if self.clientSpecDirs:2694 files = self.extractFilesFromCommit(commit)2695 self.clientSpecDirs.update_client_spec_path_cache(files)26962697 branches = {}2698 fnum =02699while"depotFile%s"% fnum in commit:2700 path = commit["depotFile%s"% fnum]2701 found = [p for p in self.depotPaths2702ifp4PathStartsWith(path, p)]2703if not found:2704 fnum = fnum +12705continue27062707file= {}2708file["path"] = path2709file["rev"] = commit["rev%s"% fnum]2710file["action"] = commit["action%s"% fnum]2711file["type"] = commit["type%s"% fnum]2712 fnum = fnum +127132714# start with the full relative path where this file would2715# go in a p4 client2716if self.useClientSpec:2717 relPath = self.clientSpecDirs.map_in_client(path)2718else:2719 relPath = self.stripRepoPath(path, self.depotPaths)27202721for branch in self.knownBranches.keys():2722# add a trailing slash so that a commit into qt/4.2foo2723# doesn't end up in qt/4.2, e.g.2724if relPath.startswith(branch +"/"):2725if branch not in branches:2726 branches[branch] = []2727 branches[branch].append(file)2728break27292730return branches27312732defwriteToGitStream(self, gitMode, relPath, contents):2733 self.gitStream.write('M%sinline%s\n'% (gitMode, relPath))2734 self.gitStream.write('data%d\n'%sum(len(d)for d in contents))2735for d in contents:2736 self.gitStream.write(d)2737 self.gitStream.write('\n')27382739defencodeWithUTF8(self, path):2740try:2741 path.decode('ascii')2742except:2743 encoding ='utf8'2744ifgitConfig('git-p4.pathEncoding'):2745 encoding =gitConfig('git-p4.pathEncoding')2746 path = path.decode(encoding,'replace').encode('utf8','replace')2747if self.verbose:2748print('Path with non-ASCII characters detected. Used%sto encode:%s'% (encoding, path))2749return path27502751# output one file from the P4 stream2752# - helper for streamP4Files27532754defstreamOneP4File(self,file, contents):2755 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)2756 relPath = self.encodeWithUTF8(relPath)2757if verbose:2758if'fileSize'in self.stream_file:2759 size =int(self.stream_file['fileSize'])2760else:2761 size =0# deleted files don't get a fileSize apparently2762 sys.stdout.write('\r%s-->%s(%iMB)\n'% (file['depotFile'], relPath, size/1024/1024))2763 sys.stdout.flush()27642765(type_base, type_mods) =split_p4_type(file["type"])27662767 git_mode ="100644"2768if"x"in type_mods:2769 git_mode ="100755"2770if type_base =="symlink":2771 git_mode ="120000"2772# p4 print on a symlink sometimes contains "target\n";2773# if it does, remove the newline2774 data =''.join(contents)2775if not data:2776# Some version of p4 allowed creating a symlink that pointed2777# to nothing. This causes p4 errors when checking out such2778# a change, and errors here too. Work around it by ignoring2779# the bad symlink; hopefully a future change fixes it.2780print("\nIgnoring empty symlink in%s"%file['depotFile'])2781return2782elif data[-1] =='\n':2783 contents = [data[:-1]]2784else:2785 contents = [data]27862787if type_base =="utf16":2788# p4 delivers different text in the python output to -G2789# than it does when using "print -o", or normal p4 client2790# 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.2793#2794# On windows, the newlines will always be mangled by print, so put2795# them back too. This is not needed to the cygwin windows version,2796# just the native "NT" type.2797#2798try:2799 text =p4_read_pipe(['print','-q','-o','-','%s@%s'% (file['depotFile'],file['change'])])2800exceptExceptionas e:2801if'Translation of file content failed'instr(e):2802 type_base ='binary'2803else:2804raise e2805else:2806ifp4_version_string().find('/NT') >=0:2807 text = text.replace('\r\n','\n')2808 contents = [ text ]28092810if type_base =="apple":2811# Apple filetype files will be streamed as a concatenation of2812# its appledouble header and the contents. This is useless2813# on both macs and non-macs. If using "print -q -o xx", it2814# will create "xx" with the data, and "%xx" with the header.2815# This is also not very useful.2816#2817# Ideally, someday, this script can learn how to generate2818# appledouble files directly and import those to git, but2819# non-mac machines can never find a use for apple filetype.2820print("\nIgnoring apple filetype file%s"%file['depotFile'])2821return28222823# 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)2826if pattern:2827 regexp = re.compile(pattern, re.VERBOSE)2828 text =''.join(contents)2829 text = regexp.sub(r'$\1$', text)2830 contents = [ text ]28312832if self.largeFileSystem:2833(git_mode, contents) = self.largeFileSystem.processContent(git_mode, relPath, contents)28342835 self.writeToGitStream(git_mode, relPath, contents)28362837defstreamOneP4Deletion(self,file):2838 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)2839 relPath = self.encodeWithUTF8(relPath)2840if verbose:2841 sys.stdout.write("delete%s\n"% relPath)2842 sys.stdout.flush()2843 self.gitStream.write("D%s\n"% relPath)28442845if self.largeFileSystem and self.largeFileSystem.isLargeFile(relPath):2846 self.largeFileSystem.removeLargeFile(relPath)28472848# handle another chunk of streaming data2849defstreamP4FilesCb(self, marshalled):28502851# catch p4 errors and complain2852 err =None2853if"code"in marshalled:2854if marshalled["code"] =="error":2855if"data"in marshalled:2856 err = marshalled["data"].rstrip()28572858if not err and'fileSize'in self.stream_file:2859 required_bytes =int((4*int(self.stream_file["fileSize"])) -calcDiskFree())2860if required_bytes >0:2861 err ='Not enough space left on%s! Free at least%iMB.'% (2862 os.getcwd(), required_bytes/1024/10242863)28642865if err:2866 f =None2867if self.stream_have_file_info:2868if"depotFile"in self.stream_file:2869 f = self.stream_file["depotFile"]2870# force a failure in fast-import, else an empty2871# commit will be made2872 self.gitStream.write("\n")2873 self.gitStream.write("die-now\n")2874 self.gitStream.close()2875# ignore errors, but make sure it exits first2876 self.importProcess.wait()2877if f:2878die("Error from p4 print for%s:%s"% (f, err))2879else:2880die("Error from p4 print:%s"% err)28812882if'depotFile'in marshalled and self.stream_have_file_info:2883# start of a new file - output the old one first2884 self.streamOneP4File(self.stream_file, self.stream_contents)2885 self.stream_file = {}2886 self.stream_contents = []2887 self.stream_have_file_info =False28882889# pick up the new file information... for the2890# 'data' field we need to append to our array2891for k in marshalled.keys():2892if k =='data':2893if'streamContentSize'not in self.stream_file:2894 self.stream_file['streamContentSize'] =02895 self.stream_file['streamContentSize'] +=len(marshalled['data'])2896 self.stream_contents.append(marshalled['data'])2897else:2898 self.stream_file[k] = marshalled[k]28992900if(verbose and2901'streamContentSize'in self.stream_file and2902'fileSize'in self.stream_file and2903'depotFile'in self.stream_file):2904 size =int(self.stream_file["fileSize"])2905if size >0:2906 progress =100*self.stream_file['streamContentSize']/size2907 sys.stdout.write('\r%s %d%%(%iMB)'% (self.stream_file['depotFile'], progress,int(size/1024/1024)))2908 sys.stdout.flush()29092910 self.stream_have_file_info =True29112912# Stream directly from "p4 files" into "git fast-import"2913defstreamP4Files(self, files):2914 filesForCommit = []2915 filesToRead = []2916 filesToDelete = []29172918for f in files:2919 filesForCommit.append(f)2920if f['action']in self.delete_actions:2921 filesToDelete.append(f)2922else:2923 filesToRead.append(f)29242925# deleted files...2926for f in filesToDelete:2927 self.streamOneP4Deletion(f)29282929iflen(filesToRead) >0:2930 self.stream_file = {}2931 self.stream_contents = []2932 self.stream_have_file_info =False29332934# curry self argument2935defstreamP4FilesCbSelf(entry):2936 self.streamP4FilesCb(entry)29372938 fileArgs = []2939for f in filesToRead:2940if'shelved_cl'in f:2941# Handle shelved CLs using the "p4 print file@=N" syntax to print2942# the contents2943 fileArg ='%s@=%d'% (f['path'], f['shelved_cl'])2944else:2945 fileArg ='%s#%s'% (f['path'], f['rev'])29462947 fileArgs.append(fileArg)29482949p4CmdList(["-x","-","print"],2950 stdin=fileArgs,2951 cb=streamP4FilesCbSelf)29522953# do the last chunk2954if'depotFile'in self.stream_file:2955 self.streamOneP4File(self.stream_file, self.stream_contents)29562957defmake_email(self, userid):2958if userid in self.users:2959return self.users[userid]2960else:2961return"%s<a@b>"% userid29622963defstreamTag(self, gitStream, labelName, labelDetails, commit, epoch):2964""" Stream a p4 tag.2965 commit is either a git commit, or a fast-import mark, ":<p4commit>"2966 """29672968if verbose:2969print("writing tag%sfor commit%s"% (labelName, commit))2970 gitStream.write("tag%s\n"% labelName)2971 gitStream.write("from%s\n"% commit)29722973if'Owner'in labelDetails:2974 owner = labelDetails["Owner"]2975else:2976 owner =None29772978# Try to use the owner of the p4 label, or failing that,2979# the current p4 user id.2980if owner:2981 email = self.make_email(owner)2982else:2983 email = self.make_email(self.p4UserId())2984 tagger ="%s %s %s"% (email, epoch, self.tz)29852986 gitStream.write("tagger%s\n"% tagger)29872988print("labelDetails=",labelDetails)2989if'Description'in labelDetails:2990 description = labelDetails['Description']2991else:2992 description ='Label from git p4'29932994 gitStream.write("data%d\n"%len(description))2995 gitStream.write(description)2996 gitStream.write("\n")29972998definClientSpec(self, path):2999if not self.clientSpecDirs:3000return True3001 inClientSpec = self.clientSpecDirs.map_in_client(path)3002if not inClientSpec and self.verbose:3003print('Ignoring file outside of client spec:{0}'.format(path))3004return inClientSpec30053006defhasBranchPrefix(self, path):3007if not self.branchPrefixes:3008return True3009 hasPrefix = [p for p in self.branchPrefixes3010ifp4PathStartsWith(path, p)]3011if not hasPrefix and self.verbose:3012print('Ignoring file outside of prefix:{0}'.format(path))3013return hasPrefix30143015defcommit(self, details, files, branch, parent ="", allow_empty=False):3016 epoch = details["time"]3017 author = details["user"]3018 jobs = self.extractJobsFromCommit(details)30193020if self.verbose:3021print('commit into{0}'.format(branch))30223023if self.clientSpecDirs:3024 self.clientSpecDirs.update_client_spec_path_cache(files)30253026 files = [f for f in files3027if self.inClientSpec(f['path'])and self.hasBranchPrefix(f['path'])]30283029ifgitConfigBool('git-p4.keepEmptyCommits'):3030 allow_empty =True30313032if not files and not allow_empty:3033print('Ignoring revision{0}as it would produce an empty commit.'3034.format(details['change']))3035return30363037 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 =""3041if author not in self.users:3042 self.getUserMapFromPerforceServer()3043 committer ="%s %s %s"% (self.make_email(author), epoch, self.tz)30443045 self.gitStream.write("committer%s\n"% committer)30463047 self.gitStream.write("data <<EOT\n")3048 self.gitStream.write(details["desc"])3049iflen(jobs) >0:3050 self.gitStream.write("\nJobs:%s"% (' '.join(jobs)))30513052if not self.suppress_meta_comment:3053 self.gitStream.write("\n[git-p4: depot-paths =\"%s\": change =%s"%3054(','.join(self.branchPrefixes), details["change"]))3055iflen(details['options']) >0:3056 self.gitStream.write(": options =%s"% details['options'])3057 self.gitStream.write("]\n")30583059 self.gitStream.write("EOT\n\n")30603061iflen(parent) >0:3062if self.verbose:3063print("parent%s"% parent)3064 self.gitStream.write("from%s\n"% parent)30653066 self.streamP4Files(files)3067 self.gitStream.write("\n")30683069 change =int(details["change"])30703071if change in self.labels:3072 label = self.labels[change]3073 labelDetails = label[0]3074 labelRevisions = label[1]3075if self.verbose:3076print("Change%sis labelled%s"% (change, labelDetails))30773078 files =p4CmdList(["files"] + ["%s...@%s"% (p, change)3079for p in self.branchPrefixes])30803081iflen(files) ==len(labelRevisions):30823083 cleanedFiles = {}3084for info in files:3085if info["action"]in self.delete_actions:3086continue3087 cleanedFiles[info["depotFile"]] = info["rev"]30883089if cleanedFiles == labelRevisions:3090 self.streamTag(self.gitStream,'tag_%s'% labelDetails['label'], labelDetails, branch, epoch)30913092else:3093if not self.silent:3094print("Tag%sdoes not match with change%s: files do not match."3095% (labelDetails["label"], change))30963097else:3098if not self.silent:3099print("Tag%sdoes not match with change%s: file count is different."3100% (labelDetails["label"], change))31013102# Build a dictionary of changelists and labels, for "detect-labels" option.3103defgetLabels(self):3104 self.labels = {}31053106 l =p4CmdList(["labels"] + ["%s..."% p for p in self.depotPaths])3107iflen(l) >0and not self.silent:3108print("Finding files belonging to labels in%s"% self.depotPaths)31093110for output in l:3111 label = output["label"]3112 revisions = {}3113 newestChange =03114if self.verbose:3115print("Querying files for label%s"% label)3116forfileinp4CmdList(["files"] +3117["%s...@%s"% (p, label)3118for p in self.depotPaths]):3119 revisions[file["depotFile"]] =file["rev"]3120 change =int(file["change"])3121if change > newestChange:3122 newestChange = change31233124 self.labels[newestChange] = [output, revisions]31253126if self.verbose:3127print("Label changes:%s"% self.labels.keys())31283129# Import p4 labels as git tags. A direct mapping does not3130# exist, so assume that if all the files are at the same revision3131# then we can use that, or it's something more complicated we should3132# just ignore.3133defimportP4Labels(self, stream, p4Labels):3134if verbose:3135print("import p4 labels: "+' '.join(p4Labels))31363137 ignoredP4Labels =gitConfigList("git-p4.ignoredP4Labels")3138 validLabelRegexp =gitConfig("git-p4.labelImportRegexp")3139iflen(validLabelRegexp) ==0:3140 validLabelRegexp = defaultLabelRegexp3141 m = re.compile(validLabelRegexp)31423143for name in p4Labels:3144 commitFound =False31453146if not m.match(name):3147if verbose:3148print("label%sdoes not match regexp%s"% (name,validLabelRegexp))3149continue31503151if name in ignoredP4Labels:3152continue31533154 labelDetails =p4CmdList(['label',"-o", name])[0]31553156# get the most recent changelist for each file in this label3157 change =p4Cmd(["changes","-m","1"] + ["%s...@%s"% (p, name)3158for p in self.depotPaths])31593160if'change'in change:3161# find the corresponding git commit; take the oldest commit3162 changelist =int(change['change'])3163if changelist in self.committedChanges:3164 gitCommit =":%d"% changelist # use a fast-import mark3165 commitFound =True3166else:3167 gitCommit =read_pipe(["git","rev-list","--max-count=1",3168"--reverse",":/\[git-p4:.*change =%d\]"% changelist], ignore_error=True)3169iflen(gitCommit) ==0:3170print("importing label%s: could not find git commit for changelist%d"% (name, changelist))3171else:3172 commitFound =True3173 gitCommit = gitCommit.strip()31743175if commitFound:3176# Convert from p4 time format3177try:3178 tmwhen = time.strptime(labelDetails['Update'],"%Y/%m/%d%H:%M:%S")3179exceptValueError:3180print("Could not convert label time%s"% labelDetails['Update'])3181 tmwhen =131823183 when =int(time.mktime(tmwhen))3184 self.streamTag(stream, name, labelDetails, gitCommit, when)3185if verbose:3186print("p4 label%smapped to git commit%s"% (name, gitCommit))3187else:3188if verbose:3189print("Label%shas no changelists - possibly deleted?"% name)31903191if not commitFound:3192# We can't import this label; don't try again as it will get very3193# expensive repeatedly fetching all the files for labels that will3194# never be imported. If the label is moved in the future, the3195# ignore will need to be removed manually.3196system(["git","config","--add","git-p4.ignoredP4Labels", name])31973198defguessProjectName(self):3199for p in self.depotPaths:3200if p.endswith("/"):3201 p = p[:-1]3202 p = p[p.strip().rfind("/") +1:]3203if not p.endswith("/"):3204 p +="/"3205return p32063207defgetBranchMapping(self):3208 lostAndFoundBranches =set()32093210 user =gitConfig("git-p4.branchUser")3211iflen(user) >0:3212 command ="branches -u%s"% user3213else:3214 command ="branches"32153216for info inp4CmdList(command):3217 details =p4Cmd(["branch","-o", info["branch"]])3218 viewIdx =03219while"View%s"% viewIdx in details:3220 paths = details["View%s"% viewIdx].split(" ")3221 viewIdx = viewIdx +13222# require standard //depot/foo/... //depot/bar/... mapping3223iflen(paths) !=2or not paths[0].endswith("/...")or not paths[1].endswith("/..."):3224continue3225 source = paths[0]3226 destination = paths[1]3227## HACK3228ifp4PathStartsWith(source, self.depotPaths[0])andp4PathStartsWith(destination, self.depotPaths[0]):3229 source = source[len(self.depotPaths[0]):-4]3230 destination = destination[len(self.depotPaths[0]):-4]32313232if destination in self.knownBranches:3233if not self.silent:3234print("p4 branch%sdefines a mapping from%sto%s"% (info["branch"], source, destination))3235print("but there exists another mapping from%sto%salready!"% (self.knownBranches[destination], destination))3236continue32373238 self.knownBranches[destination] = source32393240 lostAndFoundBranches.discard(destination)32413242if source not in self.knownBranches:3243 lostAndFoundBranches.add(source)32443245# Perforce does not strictly require branches to be defined, so we also3246# check git config for a branch list.3247#3248# Example of branch definition in git config file:3249# [git-p4]3250# branchList=main:branchA3251# branchList=main:branchB3252# branchList=branchA:branchC3253 configBranches =gitConfigList("git-p4.branchList")3254for branch in configBranches:3255if branch:3256(source, destination) = branch.split(":")3257 self.knownBranches[destination] = source32583259 lostAndFoundBranches.discard(destination)32603261if source not in self.knownBranches:3262 lostAndFoundBranches.add(source)326332643265for branch in lostAndFoundBranches:3266 self.knownBranches[branch] = branch32673268defgetBranchMappingFromGitBranches(self):3269 branches =p4BranchesInGit(self.importIntoRemotes)3270for branch in branches.keys():3271if branch =="master":3272 branch ="main"3273else:3274 branch = branch[len(self.projectName):]3275 self.knownBranches[branch] = branch32763277defupdateOptionDict(self, d):3278 option_keys = {}3279if self.keepRepoPath:3280 option_keys['keepRepoPath'] =132813282 d["options"] =' '.join(sorted(option_keys.keys()))32833284defreadOptions(self, d):3285 self.keepRepoPath = ('options'in d3286and('keepRepoPath'in d['options']))32873288defgitRefForBranch(self, branch):3289if branch =="main":3290return self.refPrefix +"master"32913292iflen(branch) <=0:3293return branch32943295return self.refPrefix + self.projectName + branch32963297defgitCommitByP4Change(self, ref, change):3298if self.verbose:3299print("looking in ref "+ ref +" for change%susing bisect..."% change)33003301 earliestCommit =""3302 latestCommit =parseRevision(ref)33033304while True:3305if self.verbose:3306print("trying: earliest%slatest%s"% (earliestCommit, latestCommit))3307 next =read_pipe("git rev-list --bisect%s %s"% (latestCommit, earliestCommit)).strip()3308iflen(next) ==0:3309if self.verbose:3310print("argh")3311return""3312 log =extractLogMessageFromGitCommit(next)3313 settings =extractSettingsGitLog(log)3314 currentChange =int(settings['change'])3315if self.verbose:3316print("current change%s"% currentChange)33173318if currentChange == change:3319if self.verbose:3320print("found%s"% next)3321return next33223323if currentChange < change:3324 earliestCommit ="^%s"% next3325else:3326 latestCommit ="%s"% next33273328return""33293330defimportNewBranch(self, branch, maxChange):3331# make fast-import flush all changes to disk and update the refs using the checkpoint3332# command so that we can try to find the branch parent in the git history3333 self.gitStream.write("checkpoint\n\n");3334 self.gitStream.flush();3335 branchPrefix = self.depotPaths[0] + branch +"/"3336range="@1,%s"% maxChange3337#print "prefix" + branchPrefix3338 changes =p4ChangesForPaths([branchPrefix],range, self.changes_block_size)3339iflen(changes) <=0:3340return False3341 firstChange = changes[0]3342#print "first change in branch: %s" % firstChange3343 sourceBranch = self.knownBranches[branch]3344 sourceDepotPath = self.depotPaths[0] + sourceBranch3345 sourceRef = self.gitRefForBranch(sourceBranch)3346#print "source " + sourceBranch33473348 branchParentChange =int(p4Cmd(["changes","-m","1","%s...@1,%s"% (sourceDepotPath, firstChange)])["change"])3349#print "branch parent: %s" % branchParentChange3350 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)3351iflen(gitParent) >0:3352 self.initialParents[self.gitRefForBranch(branch)] = gitParent3353#print "parent git commit: %s" % gitParent33543355 self.importChanges(changes)3356return True33573358defsearchParent(self, parent, branch, target):3359 parentFound =False3360for blob inread_pipe_lines(["git","rev-list","--reverse",3361"--no-merges", parent]):3362 blob = blob.strip()3363iflen(read_pipe(["git","diff-tree", blob, target])) ==0:3364 parentFound =True3365if self.verbose:3366print("Found parent of%sin commit%s"% (branch, blob))3367break3368if parentFound:3369return blob3370else:3371return None33723373defimportChanges(self, changes, origin_revision=0):3374 cnt =13375for change in changes:3376 description =p4_describe(change)3377 self.updateOptionDict(description)33783379if not self.silent:3380 sys.stdout.write("\rImporting revision%s(%s%%)"% (change, cnt *100/len(changes)))3381 sys.stdout.flush()3382 cnt = cnt +133833384try:3385if self.detectBranches:3386 branches = self.splitFilesIntoBranches(description)3387for branch in branches.keys():3388## HACK --hwn3389 branchPrefix = self.depotPaths[0] + branch +"/"3390 self.branchPrefixes = [ branchPrefix ]33913392 parent =""33933394 filesForCommit = branches[branch]33953396if self.verbose:3397print("branch is%s"% branch)33983399 self.updatedBranches.add(branch)34003401if branch not in self.createdBranches:3402 self.createdBranches.add(branch)3403 parent = self.knownBranches[branch]3404if parent == branch:3405 parent =""3406else:3407 fullBranch = self.projectName + branch3408if fullBranch not in self.p4BranchesInGit:3409if not self.silent:3410print("\nImporting new branch%s"% fullBranch);3411if self.importNewBranch(branch, change -1):3412 parent =""3413 self.p4BranchesInGit.append(fullBranch)3414if not self.silent:3415print("\nResuming with change%s"% change);34163417if self.verbose:3418print("parent determined through known branches:%s"% parent)34193420 branch = self.gitRefForBranch(branch)3421 parent = self.gitRefForBranch(parent)34223423if self.verbose:3424print("looking for initial parent for%s; current parent is%s"% (branch, parent))34253426iflen(parent) ==0and branch in self.initialParents:3427 parent = self.initialParents[branch]3428del self.initialParents[branch]34293430 blob =None3431iflen(parent) >0:3432 tempBranch ="%s/%d"% (self.tempBranchLocation, change)3433if self.verbose:3434print("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)3439if blob:3440 self.commit(description, filesForCommit, branch, blob)3441else:3442if self.verbose:3443print("Parent of%snot found. Committing into head of%s"% (branch, parent))3444 self.commit(description, filesForCommit, branch, parent)3445else:3446 files = self.extractFilesFromCommit(description)3447 self.commit(description, files, self.branch,3448 self.initialParent)3449# only needed once, to connect to the previous commit3450 self.initialParent =""3451exceptIOError:3452print(self.gitError.read())3453 sys.exit(1)34543455defsync_origin_only(self):3456if self.syncWithOrigin:3457 self.hasOrigin =originP4BranchesExist()3458if self.hasOrigin:3459if not self.silent:3460print('Syncing with origin first, using "git fetch origin"')3461system("git fetch origin")34623463defimportHeadRevision(self, revision):3464print("Doing initial import of%sfrom revision%sinto%s"% (' '.join(self.depotPaths), revision, self.branch))34653466 details = {}3467 details["user"] ="git perforce import user"3468 details["desc"] = ("Initial import of%sfrom the state at revision%s\n"3469% (' '.join(self.depotPaths), revision))3470 details["change"] = revision3471 newestRevision =034723473 fileCnt =03474 fileArgs = ["%s...%s"% (p,revision)for p in self.depotPaths]34753476for info inp4CmdList(["files"] + fileArgs):34773478if'code'in info and info['code'] =='error':3479 sys.stderr.write("p4 returned an error:%s\n"3480% info['data'])3481if 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)3486if'p4ExitCode'in info:3487 sys.stderr.write("p4 exitcode:%s\n"% info['p4ExitCode'])3488 sys.exit(1)348934903491 change =int(info["change"])3492if change > newestRevision:3493 newestRevision = change34943495if info["action"]in self.delete_actions:3496# don't increase the file cnt, otherwise details["depotFile123"] will have gaps!3497#fileCnt = fileCnt + 13498continue34993500for prop in["depotFile","rev","action","type"]:3501 details["%s%s"% (prop, fileCnt)] = info[prop]35023503 fileCnt = fileCnt +135043505 details["change"] = newestRevision35063507# Use time from top-most change so that all git p4 clones of3508# the same p4 repo have the same commit SHA1s.3509 res =p4_describe(newestRevision)3510 details["time"] = res["time"]35113512 self.updateOptionDict(details)3513try:3514 self.commit(details, self.extractFilesFromCommit(details), self.branch)3515exceptIOError:3516print("IO error with git fast-import. Is your git version recent enough?")3517print(self.gitError.read())35183519defopenStreams(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.stdout3525 self.gitStream = self.importProcess.stdin3526 self.gitError = self.importProcess.stderr35273528defcloseStreams(self):3529 self.gitStream.close()3530if self.importProcess.wait() !=0:3531die("fast-import failed:%s"% self.gitError.read())3532 self.gitOutput.close()3533 self.gitError.close()35343535defrun(self, args):3536if self.importIntoRemotes:3537 self.refPrefix ="refs/remotes/p4/"3538else:3539 self.refPrefix ="refs/heads/p4/"35403541 self.sync_origin_only()35423543 branch_arg_given =bool(self.branch)3544iflen(self.branch) ==0:3545 self.branch = self.refPrefix +"master"3546ifgitBranchExists("refs/heads/p4")and self.importIntoRemotes:3547system("git update-ref%srefs/heads/p4"% self.branch)3548system("git branch -D p4")35493550# accept either the command-line option, or the configuration variable3551if self.useClientSpec:3552# will use this after clone to set the variable3553 self.useClientSpec_from_options =True3554else:3555ifgitConfigBool("git-p4.useclientspec"):3556 self.useClientSpec =True3557if self.useClientSpec:3558 self.clientSpecDirs =getClientSpec()35593560# TODO: should always look at previous commits,3561# merge with previous imports, if possible.3562if args == []:3563if self.hasOrigin:3564createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)35653566# branches holds mapping from branch name to sha13567 branches =p4BranchesInGit(self.importIntoRemotes)35683569# restrict to just this one, disabling detect-branches3570if branch_arg_given:3571 short = self.branch.split("/")[-1]3572if short in branches:3573 self.p4BranchesInGit = [ short ]3574else:3575 self.p4BranchesInGit = branches.keys()35763577iflen(self.p4BranchesInGit) >1:3578if not self.silent:3579print("Importing from/into multiple branches")3580 self.detectBranches =True3581for branch in branches.keys():3582 self.initialParents[self.refPrefix + branch] = \3583 branches[branch]35843585if self.verbose:3586print("branches:%s"% self.p4BranchesInGit)35873588 p4Change =03589for branch in self.p4BranchesInGit:3590 logMsg =extractLogMessageFromGitCommit(self.refPrefix + branch)35913592 settings =extractSettingsGitLog(logMsg)35933594 self.readOptions(settings)3595if('depot-paths'in settings3596and'change'in settings):3597 change =int(settings['change']) +13598 p4Change =max(p4Change, change)35993600 depotPaths =sorted(settings['depot-paths'])3601if self.previousDepotPaths == []:3602 self.previousDepotPaths = depotPaths3603else:3604 paths = []3605for(prev, cur)inzip(self.previousDepotPaths, depotPaths):3606 prev_list = prev.split("/")3607 cur_list = cur.split("/")3608for i inrange(0,min(len(cur_list),len(prev_list))):3609if cur_list[i] != prev_list[i]:3610 i = i -13611break36123613 paths.append("/".join(cur_list[:i +1]))36143615 self.previousDepotPaths = paths36163617if p4Change >0:3618 self.depotPaths =sorted(self.previousDepotPaths)3619 self.changeRange ="@%s,#head"% p4Change3620if not self.silent and not self.detectBranches:3621print("Performing incremental import into%sgit branch"% self.branch)36223623# accept multiple ref name abbreviations:3624# refs/foo/bar/branch -> use it exactly3625# p4/branch -> prepend refs/remotes/ or refs/heads/3626# branch -> prepend refs/remotes/p4/ or refs/heads/p4/3627if not self.branch.startswith("refs/"):3628if self.importIntoRemotes:3629 prepend ="refs/remotes/"3630else:3631 prepend ="refs/heads/"3632if not self.branch.startswith("p4/"):3633 prepend +="p4/"3634 self.branch = prepend + self.branch36353636iflen(args) ==0and self.depotPaths:3637if not self.silent:3638print("Depot paths:%s"%' '.join(self.depotPaths))3639else:3640if self.depotPaths and self.depotPaths != args:3641print("previous import used depot path%sand now%swas specified. "3642"This doesn't work!"% (' '.join(self.depotPaths),3643' '.join(args)))3644 sys.exit(1)36453646 self.depotPaths =sorted(args)36473648 revision =""3649 self.users = {}36503651# Make sure no revision specifiers are used when --changesfile3652# is specified.3653 bad_changesfile =False3654iflen(self.changesFile) >0:3655for p in self.depotPaths:3656if p.find("@") >=0or p.find("#") >=0:3657 bad_changesfile =True3658break3659if bad_changesfile:3660die("Option --changesfile is incompatible with revision specifiers")36613662 newPaths = []3663for p in self.depotPaths:3664if p.find("@") != -1:3665 atIdx = p.index("@")3666 self.changeRange = p[atIdx:]3667if self.changeRange =="@all":3668 self.changeRange =""3669elif','not in self.changeRange:3670 revision = self.changeRange3671 self.changeRange =""3672 p = p[:atIdx]3673elif p.find("#") != -1:3674 hashIdx = p.index("#")3675 revision = p[hashIdx:]3676 p = p[:hashIdx]3677elif self.previousDepotPaths == []:3678# pay attention to changesfile, if given, else import3679# the entire p4 tree at the head revision3680iflen(self.changesFile) ==0:3681 revision ="#head"36823683 p = re.sub("\.\.\.$","", p)3684if not p.endswith("/"):3685 p +="/"36863687 newPaths.append(p)36883689 self.depotPaths = newPaths36903691# --detect-branches may change this for each branch3692 self.branchPrefixes = self.depotPaths36933694 self.loadUserMapFromCache()3695 self.labels = {}3696if self.detectLabels:3697 self.getLabels();36983699if self.detectBranches:3700## FIXME - what's a P4 projectName ?3701 self.projectName = self.guessProjectName()37023703if self.hasOrigin:3704 self.getBranchMappingFromGitBranches()3705else:3706 self.getBranchMapping()3707if self.verbose:3708print("p4-git branches:%s"% self.p4BranchesInGit)3709print("initial parents:%s"% self.initialParents)3710for b in self.p4BranchesInGit:3711if b !="master":37123713## FIXME3714 b = b[len(self.projectName):]3715 self.createdBranches.add(b)37163717 self.openStreams()37183719if revision:3720 self.importHeadRevision(revision)3721else:3722 changes = []37233724iflen(self.changesFile) >0:3725 output =open(self.changesFile).readlines()3726 changeSet =set()3727for line in output:3728 changeSet.add(int(line))37293730for change in changeSet:3731 changes.append(change)37323733 changes.sort()3734else:3735# catch "git p4 sync" with no new branches, in a repo that3736# does not have any existing p4 branches3737iflen(args) ==0:3738if not self.p4BranchesInGit:3739die("No remote p4 branches. Perhaps you never did\"git p4 clone\"in here.")37403741# The default branch is master, unless --branch is used to3742# specify something else. Make sure it exists, or complain3743# nicely about how to use --branch.3744if not self.detectBranches:3745if notbranch_exists(self.branch):3746if branch_arg_given:3747die("Error: branch%sdoes not exist."% self.branch)3748else:3749die("Error: no branch%s; perhaps specify one with --branch."%3750 self.branch)37513752if self.verbose:3753print("Getting p4 changes for%s...%s"% (', '.join(self.depotPaths),3754 self.changeRange))3755 changes =p4ChangesForPaths(self.depotPaths, self.changeRange, self.changes_block_size)37563757iflen(self.maxChanges) >0:3758 changes = changes[:min(int(self.maxChanges),len(changes))]37593760iflen(changes) ==0:3761if not self.silent:3762print("No changes to import!")3763else:3764if not self.silent and not self.detectBranches:3765print("Import destination:%s"% self.branch)37663767 self.updatedBranches =set()37683769if not self.detectBranches:3770if args:3771# start a new branch3772 self.initialParent =""3773else:3774# build on a previous revision3775 self.initialParent =parseRevision(self.branch)37763777 self.importChanges(changes)37783779if not self.silent:3780print("")3781iflen(self.updatedBranches) >0:3782 sys.stdout.write("Updated branches: ")3783for b in self.updatedBranches:3784 sys.stdout.write("%s"% b)3785 sys.stdout.write("\n")37863787ifgitConfigBool("git-p4.importLabels"):3788 self.importLabels =True37893790if self.importLabels:3791 p4Labels =getP4Labels(self.depotPaths)3792 gitTags =getGitTags()37933794 missingP4Labels = p4Labels - gitTags3795 self.importP4Labels(self.gitStream, missingP4Labels)37963797 self.closeStreams()37983799# Cleanup temporary branches created during import3800if self.tempBranches != []:3801for branch in self.tempBranches:3802read_pipe("git update-ref -d%s"% branch)3803 os.rmdir(os.path.join(os.environ.get("GIT_DIR",".git"), self.tempBranchLocation))38043805# Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow3806# a convenient shortcut refname "p4".3807if self.importIntoRemotes:3808 head_ref = self.refPrefix +"HEAD"3809if notgitBranchExists(head_ref)andgitBranchExists(self.branch):3810system(["git","symbolic-ref", head_ref, self.branch])38113812return True38133814classP4Rebase(Command):3815def__init__(self):3816 Command.__init__(self)3817 self.options = [3818 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),3819]3820 self.importLabels =False3821 self.description = ("Fetches the latest revision from perforce and "3822+"rebases the current work (branch) against it")38233824defrun(self, args):3825 sync =P4Sync()3826 sync.importLabels = self.importLabels3827 sync.run([])38283829return self.rebase()38303831defrebase(self):3832if os.system("git update-index --refresh") !=0:3833die("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.");3834iflen(read_pipe("git diff-index HEAD --")) >0:3835die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");38363837[upstream, settings] =findUpstreamBranchPoint()3838iflen(upstream) ==0:3839die("Cannot find upstream branchpoint for rebase")38403841# the branchpoint may be p4/foo~3, so strip off the parent3842 upstream = re.sub("~[0-9]+$","", upstream)38433844print("Rebasing the current branch onto%s"% upstream)3845 oldHead =read_pipe("git rev-parse HEAD").strip()3846system("git rebase%s"% upstream)3847system("git diff-tree --stat --summary -M%sHEAD --"% oldHead)3848return True38493850classP4Clone(P4Sync):3851def__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,3858help="where to leave result of the clone"),3859 optparse.make_option("--bare", dest="cloneBare",3860 action="store_true", default=False),3861]3862 self.cloneDestination =None3863 self.needsGit =False3864 self.cloneBare =False38653866defdefaultDestination(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)3873return os.path.split(depotDir)[1]38743875defrun(self, args):3876iflen(args) <1:3877return False38783879if self.keepRepoPath and not self.cloneDestination:3880 sys.stderr.write("Must specify destination for --keep-path\n")3881 sys.exit(1)38823883 depotPaths = args38843885if not self.cloneDestination andlen(depotPaths) >1:3886 self.cloneDestination = depotPaths[-1]3887 depotPaths = depotPaths[:-1]38883889 self.cloneExclude = ["/"+p for p in self.cloneExclude]3890for p in depotPaths:3891if not p.startswith("//"):3892 sys.stderr.write('Depot paths must start with "//":%s\n'% p)3893return False38943895if not self.cloneDestination:3896 self.cloneDestination = self.defaultDestination(args)38973898print("Importing from%sinto%s"% (', '.join(depotPaths), self.cloneDestination))38993900if not os.path.exists(self.cloneDestination):3901 os.makedirs(self.cloneDestination)3902chdir(self.cloneDestination)39033904 init_cmd = ["git","init"]3905if self.cloneBare:3906 init_cmd.append("--bare")3907 retcode = subprocess.call(init_cmd)3908if retcode:3909raiseCalledProcessError(retcode, init_cmd)39103911if not P4Sync.run(self, depotPaths):3912return False39133914# create a master branch and check out a work tree3915ifgitBranchExists(self.branch):3916system(["git","branch","master", self.branch ])3917if not self.cloneBare:3918system(["git","checkout","-f"])3919else:3920print('Not checking out any branch, use ' \3921'"git checkout -q -b master <branch>"')39223923# auto-set this variable if invoked with --use-client-spec3924if self.useClientSpec_from_options:3925system("git config --bool git-p4.useclientspec true")39263927return True39283929classP4Unshelve(Command):3930def__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",3938help="Use this base revision instead of the default (%s)"% self.origin),3939]3940 self.verbose =False3941 self.noCommit =False3942 self.destbranch ="refs/remotes/p4-unshelved"39433944defrenameBranch(self, branch_name):3945""" Rename the existing branch to branch_name.N3946 """39473948 found =True3949for i inrange(0,1000):3950 backup_branch_name ="{0}.{1}".format(branch_name, i)3951if notgitBranchExists(backup_branch_name):3952gitUpdateRef(backup_branch_name, branch_name)# copy ref to backup3953gitDeleteRef(branch_name)3954 found =True3955print("renamed old unshelve branch to{0}".format(backup_branch_name))3956break39573958if not found:3959 sys.exit("gave up trying to rename existing branch{0}".format(sync.branch))39603961deffindLastP4Revision(self, starting_point):3962""" Look back from starting_point for the first commit created by git-p43963 to find the P4 commit we are based on, and the depot-paths.3964 """39653966for parent in(range(65535)):3967 log =extractLogMessageFromGitCommit("{0}^{1}".format(starting_point, parent))3968 settings =extractSettingsGitLog(log)3969if'change'in settings:3970return settings39713972 sys.exit("could not find git-p4 commits in{0}".format(self.origin))39733974defcreateShelveParent(self, change, branch_name, sync, origin):3975""" Create a commit matching the parent of the shelved changelist 'change'3976 """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)39803981 parent_files = []3982for f in files:3983# if it was added in the shelved changelist, it won't exist in the parent3984if f['action']in self.add_actions:3985continue39863987# if it was deleted in the shelved changelist it must not be deleted3988# in the parent - we might even need to create it if the origin branch3989# does not have it3990if f['action']in self.delete_actions:3991 f['action'] ='add'39923993 parent_files.append(f)39943995 sync.commit(parent_description, parent_files, branch_name,3996 parent=origin, allow_empty=True)3997print("created parent commit for{0}based on{1}in{2}".format(3998 change, self.origin, branch_name))39994000defrun(self, args):4001iflen(args) !=1:4002return False40034004if notgitBranchExists(self.origin):4005 sys.exit("origin branch{0}does not exist".format(self.origin))40064007 sync =P4Sync()4008 changes = args40094010# only one change at a time4011 change = changes[0]40124013# if the target branch already exists, rename it4014 branch_name ="{0}/{1}".format(self.destbranch, change)4015ifgitBranchExists(branch_name):4016 self.renameBranch(branch_name)4017 sync.branch = branch_name40184019 sync.verbose = self.verbose4020 sync.suppress_meta_comment =True40214022 settings = self.findLastP4Revision(self.origin)4023 sync.depotPaths = settings['depot-paths']4024 sync.branchPrefixes = sync.depotPaths40254026 sync.openStreams()4027 sync.loadUserMapFromCache()4028 sync.silent =True40294030# create a commit for the parent of the shelved changelist4031 self.createShelveParent(change, branch_name, sync, self.origin)40324033# create the commit for the shelved changelist itself4034 description =p4_describe(change,True)4035 files = sync.extractFilesFromCommit(description,True, change)40364037 sync.commit(description, files, branch_name,"")4038 sync.closeStreams()40394040print("unshelved changelist{0}into{1}".format(change, branch_name))40414042return True40434044classP4Branches(Command):4045def__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 =False40514052defrun(self, args):4053iforiginP4BranchesExist():4054createOrUpdateBranchesFromOrigin()40554056 cmdline ="git rev-parse --symbolic "4057 cmdline +=" --remotes"40584059for line inread_pipe_lines(cmdline):4060 line = line.strip()40614062if not line.startswith('p4/')or line =="p4/HEAD":4063continue4064 branch = line40654066 log =extractLogMessageFromGitCommit("refs/remotes/%s"% branch)4067 settings =extractSettingsGitLog(log)40684069print("%s<=%s(%s)"% (branch,",".join(settings["depot-paths"]), settings["change"]))4070return True40714072classHelpFormatter(optparse.IndentedHelpFormatter):4073def__init__(self):4074 optparse.IndentedHelpFormatter.__init__(self)40754076defformat_description(self, description):4077if description:4078return description +"\n"4079else:4080return""40814082defprintUsage(commands):4083print("usage:%s<command> [options]"% sys.argv[0])4084print("")4085print("valid commands:%s"%", ".join(commands))4086print("")4087print("Try%s<command> --help for command specific help."% sys.argv[0])4088print("")40894090commands = {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,4100}410141024103defmain():4104iflen(sys.argv[1:]) ==0:4105printUsage(commands.keys())4106 sys.exit(2)41074108 cmdName = sys.argv[1]4109try:4110 klass = commands[cmdName]4111 cmd =klass()4112exceptKeyError:4113print("unknown command%s"% cmdName)4114print("")4115printUsage(commands.keys())4116 sys.exit(2)41174118 options = cmd.options4119 cmd.gitdir = os.environ.get("GIT_DIR",None)41204121 args = sys.argv[2:]41224123 options.append(optparse.make_option("--verbose","-v", dest="verbose", action="store_true"))4124if cmd.needsGit:4125 options.append(optparse.make_option("--git-dir", dest="gitdir"))41264127 parser = optparse.OptionParser(cmd.usage.replace("%prog","%prog "+ cmdName),4128 options,4129 description = cmd.description,4130 formatter =HelpFormatter())41314132(cmd, args) = parser.parse_args(sys.argv[2:], cmd);4133global verbose4134 verbose = cmd.verbose4135if cmd.needsGit:4136if cmd.gitdir ==None:4137 cmd.gitdir = os.path.abspath(".git")4138if notisValidGitDir(cmd.gitdir):4139# "rev-parse --git-dir" without arguments will try $PWD/.git4140 cmd.gitdir =read_pipe("git rev-parse --git-dir").strip()4141if os.path.exists(cmd.gitdir):4142 cdup =read_pipe("git rev-parse --show-cdup").strip()4143iflen(cdup) >0:4144chdir(cdup);41454146if notisValidGitDir(cmd.gitdir):4147ifisValidGitDir(cmd.gitdir +"/.git"):4148 cmd.gitdir +="/.git"4149else:4150die("fatal: cannot locate git repository at%s"% cmd.gitdir)41514152# so git commands invoked from the P4 workspace will succeed4153 os.environ["GIT_DIR"] = cmd.gitdir41544155if not cmd.run(args):4156 parser.print_help()4157 sys.exit(2)415841594160if __name__ =='__main__':4161main()