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 28 29try: 30from subprocess import CalledProcessError 31exceptImportError: 32# from python2.7:subprocess.py 33# Exception classes used by this module. 34classCalledProcessError(Exception): 35"""This exception is raised when a process run by check_call() returns 36 a non-zero exit status. The exit status will be stored in the 37 returncode attribute.""" 38def__init__(self, returncode, cmd): 39 self.returncode = returncode 40 self.cmd = cmd 41def__str__(self): 42return"Command '%s' returned non-zero exit status%d"% (self.cmd, self.returncode) 43 44verbose =False 45 46# Only labels/tags matching this will be imported/exported 47defaultLabelRegexp = r'[a-zA-Z0-9_\-.]+$' 48 49# Grab changes in blocks of this many revisions, unless otherwise requested 50defaultBlockSize =512 51 52defp4_build_cmd(cmd): 53"""Build a suitable p4 command line. 54 55 This consolidates building and returning a p4 command line into one 56 location. It means that hooking into the environment, or other configuration 57 can be done more easily. 58 """ 59 real_cmd = ["p4"] 60 61 user =gitConfig("git-p4.user") 62iflen(user) >0: 63 real_cmd += ["-u",user] 64 65 password =gitConfig("git-p4.password") 66iflen(password) >0: 67 real_cmd += ["-P", password] 68 69 port =gitConfig("git-p4.port") 70iflen(port) >0: 71 real_cmd += ["-p", port] 72 73 host =gitConfig("git-p4.host") 74iflen(host) >0: 75 real_cmd += ["-H", host] 76 77 client =gitConfig("git-p4.client") 78iflen(client) >0: 79 real_cmd += ["-c", client] 80 81 82ifisinstance(cmd,basestring): 83 real_cmd =' '.join(real_cmd) +' '+ cmd 84else: 85 real_cmd += cmd 86return real_cmd 87 88defchdir(path, is_client_path=False): 89"""Do chdir to the given path, and set the PWD environment 90 variable for use by P4. It does not look at getcwd() output. 91 Since we're not using the shell, it is necessary to set the 92 PWD environment variable explicitly. 93 94 Normally, expand the path to force it to be absolute. This 95 addresses the use of relative path names inside P4 settings, 96 e.g. P4CONFIG=.p4config. P4 does not simply open the filename 97 as given; it looks for .p4config using PWD. 98 99 If is_client_path, the path was handed to us directly by p4, 100 and may be a symbolic link. Do not call os.getcwd() in this 101 case, because it will cause p4 to think that PWD is not inside 102 the client path. 103 """ 104 105 os.chdir(path) 106if not is_client_path: 107 path = os.getcwd() 108 os.environ['PWD'] = path 109 110defcalcDiskFree(): 111"""Return free space in bytes on the disk of the given dirname.""" 112if platform.system() =='Windows': 113 free_bytes = ctypes.c_ulonglong(0) 114 ctypes.windll.kernel32.GetDiskFreeSpaceExW(ctypes.c_wchar_p(os.getcwd()),None,None, ctypes.pointer(free_bytes)) 115return free_bytes.value 116else: 117 st = os.statvfs(os.getcwd()) 118return st.f_bavail * st.f_frsize 119 120defdie(msg): 121if verbose: 122raiseException(msg) 123else: 124 sys.stderr.write(msg +"\n") 125 sys.exit(1) 126 127defwrite_pipe(c, stdin): 128if verbose: 129 sys.stderr.write('Writing pipe:%s\n'%str(c)) 130 131 expand =isinstance(c,basestring) 132 p = subprocess.Popen(c, stdin=subprocess.PIPE, shell=expand) 133 pipe = p.stdin 134 val = pipe.write(stdin) 135 pipe.close() 136if p.wait(): 137die('Command failed:%s'%str(c)) 138 139return val 140 141defp4_write_pipe(c, stdin): 142 real_cmd =p4_build_cmd(c) 143returnwrite_pipe(real_cmd, stdin) 144 145defread_pipe(c, ignore_error=False): 146if verbose: 147 sys.stderr.write('Reading pipe:%s\n'%str(c)) 148 149 expand =isinstance(c,basestring) 150 p = subprocess.Popen(c, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=expand) 151(out, err) = p.communicate() 152if p.returncode !=0and not ignore_error: 153die('Command failed:%s\nError:%s'% (str(c), err)) 154return out 155 156defp4_read_pipe(c, ignore_error=False): 157 real_cmd =p4_build_cmd(c) 158returnread_pipe(real_cmd, ignore_error) 159 160defread_pipe_lines(c): 161if verbose: 162 sys.stderr.write('Reading pipe:%s\n'%str(c)) 163 164 expand =isinstance(c, basestring) 165 p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand) 166 pipe = p.stdout 167 val = pipe.readlines() 168if pipe.close()or p.wait(): 169die('Command failed:%s'%str(c)) 170 171return val 172 173defp4_read_pipe_lines(c): 174"""Specifically invoke p4 on the command supplied. """ 175 real_cmd =p4_build_cmd(c) 176returnread_pipe_lines(real_cmd) 177 178defp4_has_command(cmd): 179"""Ask p4 for help on this command. If it returns an error, the 180 command does not exist in this version of p4.""" 181 real_cmd =p4_build_cmd(["help", cmd]) 182 p = subprocess.Popen(real_cmd, stdout=subprocess.PIPE, 183 stderr=subprocess.PIPE) 184 p.communicate() 185return p.returncode ==0 186 187defp4_has_move_command(): 188"""See if the move command exists, that it supports -k, and that 189 it has not been administratively disabled. The arguments 190 must be correct, but the filenames do not have to exist. Use 191 ones with wildcards so even if they exist, it will fail.""" 192 193if notp4_has_command("move"): 194return False 195 cmd =p4_build_cmd(["move","-k","@from","@to"]) 196 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 197(out, err) = p.communicate() 198# return code will be 1 in either case 199if err.find("Invalid option") >=0: 200return False 201if err.find("disabled") >=0: 202return False 203# assume it failed because @... was invalid changelist 204return True 205 206defsystem(cmd, ignore_error=False): 207 expand =isinstance(cmd,basestring) 208if verbose: 209 sys.stderr.write("executing%s\n"%str(cmd)) 210 retcode = subprocess.call(cmd, shell=expand) 211if retcode and not ignore_error: 212raiseCalledProcessError(retcode, cmd) 213 214return retcode 215 216defp4_system(cmd): 217"""Specifically invoke p4 as the system command. """ 218 real_cmd =p4_build_cmd(cmd) 219 expand =isinstance(real_cmd, basestring) 220 retcode = subprocess.call(real_cmd, shell=expand) 221if retcode: 222raiseCalledProcessError(retcode, real_cmd) 223 224_p4_version_string =None 225defp4_version_string(): 226"""Read the version string, showing just the last line, which 227 hopefully is the interesting version bit. 228 229 $ p4 -V 230 Perforce - The Fast Software Configuration Management System. 231 Copyright 1995-2011 Perforce Software. All rights reserved. 232 Rev. P4/NTX86/2011.1/393975 (2011/12/16). 233 """ 234global _p4_version_string 235if not _p4_version_string: 236 a =p4_read_pipe_lines(["-V"]) 237 _p4_version_string = a[-1].rstrip() 238return _p4_version_string 239 240defp4_integrate(src, dest): 241p4_system(["integrate","-Dt",wildcard_encode(src),wildcard_encode(dest)]) 242 243defp4_sync(f, *options): 244p4_system(["sync"] +list(options) + [wildcard_encode(f)]) 245 246defp4_add(f): 247# forcibly add file names with wildcards 248ifwildcard_present(f): 249p4_system(["add","-f", f]) 250else: 251p4_system(["add", f]) 252 253defp4_delete(f): 254p4_system(["delete",wildcard_encode(f)]) 255 256defp4_edit(f, *options): 257p4_system(["edit"] +list(options) + [wildcard_encode(f)]) 258 259defp4_revert(f): 260p4_system(["revert",wildcard_encode(f)]) 261 262defp4_reopen(type, f): 263p4_system(["reopen","-t",type,wildcard_encode(f)]) 264 265defp4_move(src, dest): 266p4_system(["move","-k",wildcard_encode(src),wildcard_encode(dest)]) 267 268defp4_last_change(): 269 results =p4CmdList(["changes","-m","1"]) 270returnint(results[0]['change']) 271 272defp4_describe(change): 273"""Make sure it returns a valid result by checking for 274 the presence of field "time". Return a dict of the 275 results.""" 276 277 ds =p4CmdList(["describe","-s",str(change)]) 278iflen(ds) !=1: 279die("p4 describe -s%ddid not return 1 result:%s"% (change,str(ds))) 280 281 d = ds[0] 282 283if"p4ExitCode"in d: 284die("p4 describe -s%dexited with%d:%s"% (change, d["p4ExitCode"], 285str(d))) 286if"code"in d: 287if d["code"] =="error": 288die("p4 describe -s%dreturned error code:%s"% (change,str(d))) 289 290if"time"not in d: 291die("p4 describe -s%dreturned no\"time\":%s"% (change,str(d))) 292 293return d 294 295# 296# Canonicalize the p4 type and return a tuple of the 297# base type, plus any modifiers. See "p4 help filetypes" 298# for a list and explanation. 299# 300defsplit_p4_type(p4type): 301 302 p4_filetypes_historical = { 303"ctempobj":"binary+Sw", 304"ctext":"text+C", 305"cxtext":"text+Cx", 306"ktext":"text+k", 307"kxtext":"text+kx", 308"ltext":"text+F", 309"tempobj":"binary+FSw", 310"ubinary":"binary+F", 311"uresource":"resource+F", 312"uxbinary":"binary+Fx", 313"xbinary":"binary+x", 314"xltext":"text+Fx", 315"xtempobj":"binary+Swx", 316"xtext":"text+x", 317"xunicode":"unicode+x", 318"xutf16":"utf16+x", 319} 320if p4type in p4_filetypes_historical: 321 p4type = p4_filetypes_historical[p4type] 322 mods ="" 323 s = p4type.split("+") 324 base = s[0] 325 mods ="" 326iflen(s) >1: 327 mods = s[1] 328return(base, mods) 329 330# 331# return the raw p4 type of a file (text, text+ko, etc) 332# 333defp4_type(f): 334 results =p4CmdList(["fstat","-T","headType",wildcard_encode(f)]) 335return results[0]['headType'] 336 337# 338# Given a type base and modifier, return a regexp matching 339# the keywords that can be expanded in the file 340# 341defp4_keywords_regexp_for_type(base, type_mods): 342if base in("text","unicode","binary"): 343 kwords =None 344if"ko"in type_mods: 345 kwords ='Id|Header' 346elif"k"in type_mods: 347 kwords ='Id|Header|Author|Date|DateTime|Change|File|Revision' 348else: 349return None 350 pattern = r""" 351 \$ # Starts with a dollar, followed by... 352 (%s) # one of the keywords, followed by... 353 (:[^$\n]+)? # possibly an old expansion, followed by... 354 \$ # another dollar 355 """% kwords 356return pattern 357else: 358return None 359 360# 361# Given a file, return a regexp matching the possible 362# RCS keywords that will be expanded, or None for files 363# with kw expansion turned off. 364# 365defp4_keywords_regexp_for_file(file): 366if not os.path.exists(file): 367return None 368else: 369(type_base, type_mods) =split_p4_type(p4_type(file)) 370returnp4_keywords_regexp_for_type(type_base, type_mods) 371 372defsetP4ExecBit(file, mode): 373# Reopens an already open file and changes the execute bit to match 374# the execute bit setting in the passed in mode. 375 376 p4Type ="+x" 377 378if notisModeExec(mode): 379 p4Type =getP4OpenedType(file) 380 p4Type = re.sub('^([cku]?)x(.*)','\\1\\2', p4Type) 381 p4Type = re.sub('(.*?\+.*?)x(.*?)','\\1\\2', p4Type) 382if p4Type[-1] =="+": 383 p4Type = p4Type[0:-1] 384 385p4_reopen(p4Type,file) 386 387defgetP4OpenedType(file): 388# Returns the perforce file type for the given file. 389 390 result =p4_read_pipe(["opened",wildcard_encode(file)]) 391 match = re.match(".*\((.+)\)( \*exclusive\*)?\r?$", result) 392if match: 393return match.group(1) 394else: 395die("Could not determine file type for%s(result: '%s')"% (file, result)) 396 397# Return the set of all p4 labels 398defgetP4Labels(depotPaths): 399 labels =set() 400ifisinstance(depotPaths,basestring): 401 depotPaths = [depotPaths] 402 403for l inp4CmdList(["labels"] + ["%s..."% p for p in depotPaths]): 404 label = l['label'] 405 labels.add(label) 406 407return labels 408 409# Return the set of all git tags 410defgetGitTags(): 411 gitTags =set() 412for line inread_pipe_lines(["git","tag"]): 413 tag = line.strip() 414 gitTags.add(tag) 415return gitTags 416 417defdiffTreePattern(): 418# This is a simple generator for the diff tree regex pattern. This could be 419# a class variable if this and parseDiffTreeEntry were a part of a class. 420 pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)') 421while True: 422yield pattern 423 424defparseDiffTreeEntry(entry): 425"""Parses a single diff tree entry into its component elements. 426 427 See git-diff-tree(1) manpage for details about the format of the diff 428 output. This method returns a dictionary with the following elements: 429 430 src_mode - The mode of the source file 431 dst_mode - The mode of the destination file 432 src_sha1 - The sha1 for the source file 433 dst_sha1 - The sha1 fr the destination file 434 status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc) 435 status_score - The score for the status (applicable for 'C' and 'R' 436 statuses). This is None if there is no score. 437 src - The path for the source file. 438 dst - The path for the destination file. This is only present for 439 copy or renames. If it is not present, this is None. 440 441 If the pattern is not matched, None is returned.""" 442 443 match =diffTreePattern().next().match(entry) 444if match: 445return{ 446'src_mode': match.group(1), 447'dst_mode': match.group(2), 448'src_sha1': match.group(3), 449'dst_sha1': match.group(4), 450'status': match.group(5), 451'status_score': match.group(6), 452'src': match.group(7), 453'dst': match.group(10) 454} 455return None 456 457defisModeExec(mode): 458# Returns True if the given git mode represents an executable file, 459# otherwise False. 460return mode[-3:] =="755" 461 462defisModeExecChanged(src_mode, dst_mode): 463returnisModeExec(src_mode) !=isModeExec(dst_mode) 464 465defp4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None): 466 467ifisinstance(cmd,basestring): 468 cmd ="-G "+ cmd 469 expand =True 470else: 471 cmd = ["-G"] + cmd 472 expand =False 473 474 cmd =p4_build_cmd(cmd) 475if verbose: 476 sys.stderr.write("Opening pipe:%s\n"%str(cmd)) 477 478# Use a temporary file to avoid deadlocks without 479# subprocess.communicate(), which would put another copy 480# of stdout into memory. 481 stdin_file =None 482if stdin is not None: 483 stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode) 484ifisinstance(stdin,basestring): 485 stdin_file.write(stdin) 486else: 487for i in stdin: 488 stdin_file.write(i +'\n') 489 stdin_file.flush() 490 stdin_file.seek(0) 491 492 p4 = subprocess.Popen(cmd, 493 shell=expand, 494 stdin=stdin_file, 495 stdout=subprocess.PIPE) 496 497 result = [] 498try: 499while True: 500 entry = marshal.load(p4.stdout) 501if cb is not None: 502cb(entry) 503else: 504 result.append(entry) 505exceptEOFError: 506pass 507 exitCode = p4.wait() 508if exitCode !=0: 509 entry = {} 510 entry["p4ExitCode"] = exitCode 511 result.append(entry) 512 513return result 514 515defp4Cmd(cmd): 516list=p4CmdList(cmd) 517 result = {} 518for entry inlist: 519 result.update(entry) 520return result; 521 522defp4Where(depotPath): 523if not depotPath.endswith("/"): 524 depotPath +="/" 525 depotPathLong = depotPath +"..." 526 outputList =p4CmdList(["where", depotPathLong]) 527 output =None 528for entry in outputList: 529if"depotFile"in entry: 530# Search for the base client side depot path, as long as it starts with the branch's P4 path. 531# The base path always ends with "/...". 532if entry["depotFile"].find(depotPath) ==0and entry["depotFile"][-4:] =="/...": 533 output = entry 534break 535elif"data"in entry: 536 data = entry.get("data") 537 space = data.find(" ") 538if data[:space] == depotPath: 539 output = entry 540break 541if output ==None: 542return"" 543if output["code"] =="error": 544return"" 545 clientPath ="" 546if"path"in output: 547 clientPath = output.get("path") 548elif"data"in output: 549 data = output.get("data") 550 lastSpace = data.rfind(" ") 551 clientPath = data[lastSpace +1:] 552 553if clientPath.endswith("..."): 554 clientPath = clientPath[:-3] 555return clientPath 556 557defcurrentGitBranch(): 558 retcode =system(["git","symbolic-ref","-q","HEAD"], ignore_error=True) 559if retcode !=0: 560# on a detached head 561return None 562else: 563returnread_pipe(["git","name-rev","HEAD"]).split(" ")[1].strip() 564 565defisValidGitDir(path): 566if(os.path.exists(path +"/HEAD") 567and os.path.exists(path +"/refs")and os.path.exists(path +"/objects")): 568return True; 569return False 570 571defparseRevision(ref): 572returnread_pipe("git rev-parse%s"% ref).strip() 573 574defbranchExists(ref): 575 rev =read_pipe(["git","rev-parse","-q","--verify", ref], 576 ignore_error=True) 577returnlen(rev) >0 578 579defextractLogMessageFromGitCommit(commit): 580 logMessage ="" 581 582## fixme: title is first line of commit, not 1st paragraph. 583 foundTitle =False 584for log inread_pipe_lines("git cat-file commit%s"% commit): 585if not foundTitle: 586iflen(log) ==1: 587 foundTitle =True 588continue 589 590 logMessage += log 591return logMessage 592 593defextractSettingsGitLog(log): 594 values = {} 595for line in log.split("\n"): 596 line = line.strip() 597 m = re.search(r"^ *\[git-p4: (.*)\]$", line) 598if not m: 599continue 600 601 assignments = m.group(1).split(':') 602for a in assignments: 603 vals = a.split('=') 604 key = vals[0].strip() 605 val = ('='.join(vals[1:])).strip() 606if val.endswith('\"')and val.startswith('"'): 607 val = val[1:-1] 608 609 values[key] = val 610 611 paths = values.get("depot-paths") 612if not paths: 613 paths = values.get("depot-path") 614if paths: 615 values['depot-paths'] = paths.split(',') 616return values 617 618defgitBranchExists(branch): 619 proc = subprocess.Popen(["git","rev-parse", branch], 620 stderr=subprocess.PIPE, stdout=subprocess.PIPE); 621return proc.wait() ==0; 622 623_gitConfig = {} 624 625defgitConfig(key, typeSpecifier=None): 626if not _gitConfig.has_key(key): 627 cmd = ["git","config"] 628if typeSpecifier: 629 cmd += [ typeSpecifier ] 630 cmd += [ key ] 631 s =read_pipe(cmd, ignore_error=True) 632 _gitConfig[key] = s.strip() 633return _gitConfig[key] 634 635defgitConfigBool(key): 636"""Return a bool, using git config --bool. It is True only if the 637 variable is set to true, and False if set to false or not present 638 in the config.""" 639 640if not _gitConfig.has_key(key): 641 _gitConfig[key] =gitConfig(key,'--bool') =="true" 642return _gitConfig[key] 643 644defgitConfigInt(key): 645if not _gitConfig.has_key(key): 646 cmd = ["git","config","--int", key ] 647 s =read_pipe(cmd, ignore_error=True) 648 v = s.strip() 649try: 650 _gitConfig[key] =int(gitConfig(key,'--int')) 651exceptValueError: 652 _gitConfig[key] =None 653return _gitConfig[key] 654 655defgitConfigList(key): 656if not _gitConfig.has_key(key): 657 s =read_pipe(["git","config","--get-all", key], ignore_error=True) 658 _gitConfig[key] = s.strip().split(os.linesep) 659if _gitConfig[key] == ['']: 660 _gitConfig[key] = [] 661return _gitConfig[key] 662 663defp4BranchesInGit(branchesAreInRemotes=True): 664"""Find all the branches whose names start with "p4/", looking 665 in remotes or heads as specified by the argument. Return 666 a dictionary of{ branch: revision }for each one found. 667 The branch names are the short names, without any 668 "p4/" prefix.""" 669 670 branches = {} 671 672 cmdline ="git rev-parse --symbolic " 673if branchesAreInRemotes: 674 cmdline +="--remotes" 675else: 676 cmdline +="--branches" 677 678for line inread_pipe_lines(cmdline): 679 line = line.strip() 680 681# only import to p4/ 682if not line.startswith('p4/'): 683continue 684# special symbolic ref to p4/master 685if line =="p4/HEAD": 686continue 687 688# strip off p4/ prefix 689 branch = line[len("p4/"):] 690 691 branches[branch] =parseRevision(line) 692 693return branches 694 695defbranch_exists(branch): 696"""Make sure that the given ref name really exists.""" 697 698 cmd = ["git","rev-parse","--symbolic","--verify", branch ] 699 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 700 out, _ = p.communicate() 701if p.returncode: 702return False 703# expect exactly one line of output: the branch name 704return out.rstrip() == branch 705 706deffindUpstreamBranchPoint(head ="HEAD"): 707 branches =p4BranchesInGit() 708# map from depot-path to branch name 709 branchByDepotPath = {} 710for branch in branches.keys(): 711 tip = branches[branch] 712 log =extractLogMessageFromGitCommit(tip) 713 settings =extractSettingsGitLog(log) 714if settings.has_key("depot-paths"): 715 paths =",".join(settings["depot-paths"]) 716 branchByDepotPath[paths] ="remotes/p4/"+ branch 717 718 settings =None 719 parent =0 720while parent <65535: 721 commit = head +"~%s"% parent 722 log =extractLogMessageFromGitCommit(commit) 723 settings =extractSettingsGitLog(log) 724if settings.has_key("depot-paths"): 725 paths =",".join(settings["depot-paths"]) 726if branchByDepotPath.has_key(paths): 727return[branchByDepotPath[paths], settings] 728 729 parent = parent +1 730 731return["", settings] 732 733defcreateOrUpdateBranchesFromOrigin(localRefPrefix ="refs/remotes/p4/", silent=True): 734if not silent: 735print("Creating/updating branch(es) in%sbased on origin branch(es)" 736% localRefPrefix) 737 738 originPrefix ="origin/p4/" 739 740for line inread_pipe_lines("git rev-parse --symbolic --remotes"): 741 line = line.strip() 742if(not line.startswith(originPrefix))or line.endswith("HEAD"): 743continue 744 745 headName = line[len(originPrefix):] 746 remoteHead = localRefPrefix + headName 747 originHead = line 748 749 original =extractSettingsGitLog(extractLogMessageFromGitCommit(originHead)) 750if(not original.has_key('depot-paths') 751or not original.has_key('change')): 752continue 753 754 update =False 755if notgitBranchExists(remoteHead): 756if verbose: 757print"creating%s"% remoteHead 758 update =True 759else: 760 settings =extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead)) 761if settings.has_key('change') >0: 762if settings['depot-paths'] == original['depot-paths']: 763 originP4Change =int(original['change']) 764 p4Change =int(settings['change']) 765if originP4Change > p4Change: 766print("%s(%s) is newer than%s(%s). " 767"Updating p4 branch from origin." 768% (originHead, originP4Change, 769 remoteHead, p4Change)) 770 update =True 771else: 772print("Ignoring:%swas imported from%swhile " 773"%swas imported from%s" 774% (originHead,','.join(original['depot-paths']), 775 remoteHead,','.join(settings['depot-paths']))) 776 777if update: 778system("git update-ref%s %s"% (remoteHead, originHead)) 779 780deforiginP4BranchesExist(): 781returngitBranchExists("origin")orgitBranchExists("origin/p4")orgitBranchExists("origin/p4/master") 782 783 784defp4ParseNumericChangeRange(parts): 785 changeStart =int(parts[0][1:]) 786if parts[1] =='#head': 787 changeEnd =p4_last_change() 788else: 789 changeEnd =int(parts[1]) 790 791return(changeStart, changeEnd) 792 793defchooseBlockSize(blockSize): 794if blockSize: 795return blockSize 796else: 797return defaultBlockSize 798 799defp4ChangesForPaths(depotPaths, changeRange, requestedBlockSize): 800assert depotPaths 801 802# Parse the change range into start and end. Try to find integer 803# revision ranges as these can be broken up into blocks to avoid 804# hitting server-side limits (maxrows, maxscanresults). But if 805# that doesn't work, fall back to using the raw revision specifier 806# strings, without using block mode. 807 808if changeRange is None or changeRange =='': 809 changeStart =1 810 changeEnd =p4_last_change() 811 block_size =chooseBlockSize(requestedBlockSize) 812else: 813 parts = changeRange.split(',') 814assertlen(parts) ==2 815try: 816(changeStart, changeEnd) =p4ParseNumericChangeRange(parts) 817 block_size =chooseBlockSize(requestedBlockSize) 818except: 819 changeStart = parts[0][1:] 820 changeEnd = parts[1] 821if requestedBlockSize: 822die("cannot use --changes-block-size with non-numeric revisions") 823 block_size =None 824 825 changes = [] 826 827# Retrieve changes a block at a time, to prevent running 828# into a MaxResults/MaxScanRows error from the server. 829 830while True: 831 cmd = ['changes'] 832 833if block_size: 834 end =min(changeEnd, changeStart + block_size) 835 revisionRange ="%d,%d"% (changeStart, end) 836else: 837 revisionRange ="%s,%s"% (changeStart, changeEnd) 838 839for p in depotPaths: 840 cmd += ["%s...@%s"% (p, revisionRange)] 841 842# Insert changes in chronological order 843for line inreversed(p4_read_pipe_lines(cmd)): 844 changes.append(int(line.split(" ")[1])) 845 846if not block_size: 847break 848 849if end >= changeEnd: 850break 851 852 changeStart = end +1 853 854 changes =sorted(changes) 855return changes 856 857defp4PathStartsWith(path, prefix): 858# This method tries to remedy a potential mixed-case issue: 859# 860# If UserA adds //depot/DirA/file1 861# and UserB adds //depot/dira/file2 862# 863# we may or may not have a problem. If you have core.ignorecase=true, 864# we treat DirA and dira as the same directory 865ifgitConfigBool("core.ignorecase"): 866return path.lower().startswith(prefix.lower()) 867return path.startswith(prefix) 868 869defgetClientSpec(): 870"""Look at the p4 client spec, create a View() object that contains 871 all the mappings, and return it.""" 872 873 specList =p4CmdList("client -o") 874iflen(specList) !=1: 875die('Output from "client -o" is%dlines, expecting 1'% 876len(specList)) 877 878# dictionary of all client parameters 879 entry = specList[0] 880 881# the //client/ name 882 client_name = entry["Client"] 883 884# just the keys that start with "View" 885 view_keys = [ k for k in entry.keys()if k.startswith("View") ] 886 887# hold this new View 888 view =View(client_name) 889 890# append the lines, in order, to the view 891for view_num inrange(len(view_keys)): 892 k ="View%d"% view_num 893if k not in view_keys: 894die("Expected view key%smissing"% k) 895 view.append(entry[k]) 896 897return view 898 899defgetClientRoot(): 900"""Grab the client directory.""" 901 902 output =p4CmdList("client -o") 903iflen(output) !=1: 904die('Output from "client -o" is%dlines, expecting 1'%len(output)) 905 906 entry = output[0] 907if"Root"not in entry: 908die('Client has no "Root"') 909 910return entry["Root"] 911 912# 913# P4 wildcards are not allowed in filenames. P4 complains 914# if you simply add them, but you can force it with "-f", in 915# which case it translates them into %xx encoding internally. 916# 917defwildcard_decode(path): 918# Search for and fix just these four characters. Do % last so 919# that fixing it does not inadvertently create new %-escapes. 920# Cannot have * in a filename in windows; untested as to 921# what p4 would do in such a case. 922if not platform.system() =="Windows": 923 path = path.replace("%2A","*") 924 path = path.replace("%23","#") \ 925.replace("%40","@") \ 926.replace("%25","%") 927return path 928 929defwildcard_encode(path): 930# do % first to avoid double-encoding the %s introduced here 931 path = path.replace("%","%25") \ 932.replace("*","%2A") \ 933.replace("#","%23") \ 934.replace("@","%40") 935return path 936 937defwildcard_present(path): 938 m = re.search("[*#@%]", path) 939return m is not None 940 941classLargeFileSystem(object): 942"""Base class for large file system support.""" 943 944def__init__(self, writeToGitStream): 945 self.largeFiles =set() 946 self.writeToGitStream = writeToGitStream 947 948defgeneratePointer(self, cloneDestination, contentFile): 949"""Return the content of a pointer file that is stored in Git instead of 950 the actual content.""" 951assert False,"Method 'generatePointer' required in "+ self.__class__.__name__ 952 953defpushFile(self, localLargeFile): 954"""Push the actual content which is not stored in the Git repository to 955 a server.""" 956assert False,"Method 'pushFile' required in "+ self.__class__.__name__ 957 958defhasLargeFileExtension(self, relPath): 959returnreduce( 960lambda a, b: a or b, 961[relPath.endswith('.'+ e)for e ingitConfigList('git-p4.largeFileExtensions')], 962False 963) 964 965defgenerateTempFile(self, contents): 966 contentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=False) 967for d in contents: 968 contentFile.write(d) 969 contentFile.close() 970return contentFile.name 971 972defexceedsLargeFileThreshold(self, relPath, contents): 973ifgitConfigInt('git-p4.largeFileThreshold'): 974 contentsSize =sum(len(d)for d in contents) 975if contentsSize >gitConfigInt('git-p4.largeFileThreshold'): 976return True 977ifgitConfigInt('git-p4.largeFileCompressedThreshold'): 978 contentsSize =sum(len(d)for d in contents) 979if contentsSize <=gitConfigInt('git-p4.largeFileCompressedThreshold'): 980return False 981 contentTempFile = self.generateTempFile(contents) 982 compressedContentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=False) 983 zf = zipfile.ZipFile(compressedContentFile.name, mode='w') 984 zf.write(contentTempFile, compress_type=zipfile.ZIP_DEFLATED) 985 zf.close() 986 compressedContentsSize = zf.infolist()[0].compress_size 987 os.remove(contentTempFile) 988 os.remove(compressedContentFile.name) 989if compressedContentsSize >gitConfigInt('git-p4.largeFileCompressedThreshold'): 990return True 991return False 992 993defaddLargeFile(self, relPath): 994 self.largeFiles.add(relPath) 995 996defremoveLargeFile(self, relPath): 997 self.largeFiles.remove(relPath) 998 999defisLargeFile(self, relPath):1000return relPath in self.largeFiles10011002defprocessContent(self, git_mode, relPath, contents):1003"""Processes the content of git fast import. This method decides if a1004 file is stored in the large file system and handles all necessary1005 steps."""1006if self.exceedsLargeFileThreshold(relPath, contents)or self.hasLargeFileExtension(relPath):1007 contentTempFile = self.generateTempFile(contents)1008(git_mode, contents, localLargeFile) = self.generatePointer(contentTempFile)10091010# Move temp file to final location in large file system1011 largeFileDir = os.path.dirname(localLargeFile)1012if not os.path.isdir(largeFileDir):1013 os.makedirs(largeFileDir)1014 shutil.move(contentTempFile, localLargeFile)1015 self.addLargeFile(relPath)1016ifgitConfigBool('git-p4.largeFilePush'):1017 self.pushFile(localLargeFile)1018if verbose:1019 sys.stderr.write("%smoved to large file system (%s)\n"% (relPath, localLargeFile))1020return(git_mode, contents)10211022classMockLFS(LargeFileSystem):1023"""Mock large file system for testing."""10241025defgeneratePointer(self, contentFile):1026"""The pointer content is the original content prefixed with "pointer-".1027 The local filename of the large file storage is derived from the file content.1028 """1029withopen(contentFile,'r')as f:1030 content =next(f)1031 gitMode ='100644'1032 pointerContents ='pointer-'+ content1033 localLargeFile = os.path.join(os.getcwd(),'.git','mock-storage','local', content[:-1])1034return(gitMode, pointerContents, localLargeFile)10351036defpushFile(self, localLargeFile):1037"""The remote filename of the large file storage is the same as the local1038 one but in a different directory.1039 """1040 remotePath = os.path.join(os.path.dirname(localLargeFile),'..','remote')1041if not os.path.exists(remotePath):1042 os.makedirs(remotePath)1043 shutil.copyfile(localLargeFile, os.path.join(remotePath, os.path.basename(localLargeFile)))10441045classGitLFS(LargeFileSystem):1046"""Git LFS as backend for the git-p4 large file system.1047 See https://git-lfs.github.com/ for details."""10481049def__init__(self, *args):1050 LargeFileSystem.__init__(self, *args)1051 self.baseGitAttributes = []10521053defgeneratePointer(self, contentFile):1054"""Generate a Git LFS pointer for the content. Return LFS Pointer file1055 mode and content which is stored in the Git repository instead of1056 the actual content. Return also the new location of the actual1057 content.1058 """1059 pointerProcess = subprocess.Popen(1060['git','lfs','pointer','--file='+ contentFile],1061 stdout=subprocess.PIPE1062)1063 pointerFile = pointerProcess.stdout.read()1064if pointerProcess.wait():1065 os.remove(contentFile)1066die('git-lfs pointer command failed. Did you install the extension?')1067 pointerContents = [i+'\n'for i in pointerFile.split('\n')[2:][:-1]]1068 oid = pointerContents[1].split(' ')[1].split(':')[1][:-1]1069 localLargeFile = os.path.join(1070 os.getcwd(),1071'.git','lfs','objects', oid[:2], oid[2:4],1072 oid,1073)1074# LFS Spec states that pointer files should not have the executable bit set.1075 gitMode ='100644'1076return(gitMode, pointerContents, localLargeFile)10771078defpushFile(self, localLargeFile):1079 uploadProcess = subprocess.Popen(1080['git','lfs','push','--object-id','origin', os.path.basename(localLargeFile)]1081)1082if uploadProcess.wait():1083die('git-lfs push command failed. Did you define a remote?')10841085defgenerateGitAttributes(self):1086return(1087 self.baseGitAttributes +1088[1089'\n',1090'#\n',1091'# Git LFS (see https://git-lfs.github.com/)\n',1092'#\n',1093] +1094['*.'+ f.replace(' ','[[:space:]]') +' filter=lfs -text\n'1095for f insorted(gitConfigList('git-p4.largeFileExtensions'))1096] +1097['/'+ f.replace(' ','[[:space:]]') +' filter=lfs -text\n'1098for f insorted(self.largeFiles)if not self.hasLargeFileExtension(f)1099]1100)11011102defaddLargeFile(self, relPath):1103 LargeFileSystem.addLargeFile(self, relPath)1104 self.writeToGitStream('100644','.gitattributes', self.generateGitAttributes())11051106defremoveLargeFile(self, relPath):1107 LargeFileSystem.removeLargeFile(self, relPath)1108 self.writeToGitStream('100644','.gitattributes', self.generateGitAttributes())11091110defprocessContent(self, git_mode, relPath, contents):1111if relPath =='.gitattributes':1112 self.baseGitAttributes = contents1113return(git_mode, self.generateGitAttributes())1114else:1115return LargeFileSystem.processContent(self, git_mode, relPath, contents)11161117class Command:1118def__init__(self):1119 self.usage ="usage: %prog [options]"1120 self.needsGit =True1121 self.verbose =False11221123class P4UserMap:1124def__init__(self):1125 self.userMapFromPerforceServer =False1126 self.myP4UserId =None11271128defp4UserId(self):1129if self.myP4UserId:1130return self.myP4UserId11311132 results =p4CmdList("user -o")1133for r in results:1134if r.has_key('User'):1135 self.myP4UserId = r['User']1136return r['User']1137die("Could not find your p4 user id")11381139defp4UserIsMe(self, p4User):1140# return True if the given p4 user is actually me1141 me = self.p4UserId()1142if not p4User or p4User != me:1143return False1144else:1145return True11461147defgetUserCacheFilename(self):1148 home = os.environ.get("HOME", os.environ.get("USERPROFILE"))1149return home +"/.gitp4-usercache.txt"11501151defgetUserMapFromPerforceServer(self):1152if self.userMapFromPerforceServer:1153return1154 self.users = {}1155 self.emails = {}11561157for output inp4CmdList("users"):1158if not output.has_key("User"):1159continue1160 self.users[output["User"]] = output["FullName"] +" <"+ output["Email"] +">"1161 self.emails[output["Email"]] = output["User"]11621163 mapUserConfigRegex = re.compile(r"^\s*(\S+)\s*=\s*(.+)\s*<(\S+)>\s*$", re.VERBOSE)1164for mapUserConfig ingitConfigList("git-p4.mapUser"):1165 mapUser = mapUserConfigRegex.findall(mapUserConfig)1166if mapUser andlen(mapUser[0]) ==3:1167 user = mapUser[0][0]1168 fullname = mapUser[0][1]1169 email = mapUser[0][2]1170 self.users[user] = fullname +" <"+ email +">"1171 self.emails[email] = user11721173 s =''1174for(key, val)in self.users.items():1175 s +="%s\t%s\n"% (key.expandtabs(1), val.expandtabs(1))11761177open(self.getUserCacheFilename(),"wb").write(s)1178 self.userMapFromPerforceServer =True11791180defloadUserMapFromCache(self):1181 self.users = {}1182 self.userMapFromPerforceServer =False1183try:1184 cache =open(self.getUserCacheFilename(),"rb")1185 lines = cache.readlines()1186 cache.close()1187for line in lines:1188 entry = line.strip().split("\t")1189 self.users[entry[0]] = entry[1]1190exceptIOError:1191 self.getUserMapFromPerforceServer()11921193classP4Debug(Command):1194def__init__(self):1195 Command.__init__(self)1196 self.options = []1197 self.description ="A tool to debug the output of p4 -G."1198 self.needsGit =False11991200defrun(self, args):1201 j =01202for output inp4CmdList(args):1203print'Element:%d'% j1204 j +=11205print output1206return True12071208classP4RollBack(Command):1209def__init__(self):1210 Command.__init__(self)1211 self.options = [1212 optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true")1213]1214 self.description ="A tool to debug the multi-branch import. Don't use :)"1215 self.rollbackLocalBranches =False12161217defrun(self, args):1218iflen(args) !=1:1219return False1220 maxChange =int(args[0])12211222if"p4ExitCode"inp4Cmd("changes -m 1"):1223die("Problems executing p4");12241225if self.rollbackLocalBranches:1226 refPrefix ="refs/heads/"1227 lines =read_pipe_lines("git rev-parse --symbolic --branches")1228else:1229 refPrefix ="refs/remotes/"1230 lines =read_pipe_lines("git rev-parse --symbolic --remotes")12311232for line in lines:1233if self.rollbackLocalBranches or(line.startswith("p4/")and line !="p4/HEAD\n"):1234 line = line.strip()1235 ref = refPrefix + line1236 log =extractLogMessageFromGitCommit(ref)1237 settings =extractSettingsGitLog(log)12381239 depotPaths = settings['depot-paths']1240 change = settings['change']12411242 changed =False12431244iflen(p4Cmd("changes -m 1 "+' '.join(['%s...@%s'% (p, maxChange)1245for p in depotPaths]))) ==0:1246print"Branch%sdid not exist at change%s, deleting."% (ref, maxChange)1247system("git update-ref -d%s`git rev-parse%s`"% (ref, ref))1248continue12491250while change andint(change) > maxChange:1251 changed =True1252if self.verbose:1253print"%sis at%s; rewinding towards%s"% (ref, change, maxChange)1254system("git update-ref%s\"%s^\""% (ref, ref))1255 log =extractLogMessageFromGitCommit(ref)1256 settings =extractSettingsGitLog(log)125712581259 depotPaths = settings['depot-paths']1260 change = settings['change']12611262if changed:1263print"%srewound to%s"% (ref, change)12641265return True12661267classP4Submit(Command, P4UserMap):12681269 conflict_behavior_choices = ("ask","skip","quit")12701271def__init__(self):1272 Command.__init__(self)1273 P4UserMap.__init__(self)1274 self.options = [1275 optparse.make_option("--origin", dest="origin"),1276 optparse.make_option("-M", dest="detectRenames", action="store_true"),1277# preserve the user, requires relevant p4 permissions1278 optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"),1279 optparse.make_option("--export-labels", dest="exportLabels", action="store_true"),1280 optparse.make_option("--dry-run","-n", dest="dry_run", action="store_true"),1281 optparse.make_option("--prepare-p4-only", dest="prepare_p4_only", action="store_true"),1282 optparse.make_option("--conflict", dest="conflict_behavior",1283 choices=self.conflict_behavior_choices),1284 optparse.make_option("--branch", dest="branch"),1285]1286 self.description ="Submit changes from git to the perforce depot."1287 self.usage +=" [name of git branch to submit into perforce depot]"1288 self.origin =""1289 self.detectRenames =False1290 self.preserveUser =gitConfigBool("git-p4.preserveUser")1291 self.dry_run =False1292 self.prepare_p4_only =False1293 self.conflict_behavior =None1294 self.isWindows = (platform.system() =="Windows")1295 self.exportLabels =False1296 self.p4HasMoveCommand =p4_has_move_command()1297 self.branch =None12981299ifgitConfig('git-p4.largeFileSystem'):1300die("Large file system not supported for git-p4 submit command. Please remove it from config.")13011302defcheck(self):1303iflen(p4CmdList("opened ...")) >0:1304die("You have files opened with perforce! Close them before starting the sync.")13051306defseparate_jobs_from_description(self, message):1307"""Extract and return a possible Jobs field in the commit1308 message. It goes into a separate section in the p4 change1309 specification.13101311 A jobs line starts with "Jobs:" and looks like a new field1312 in a form. Values are white-space separated on the same1313 line or on following lines that start with a tab.13141315 This does not parse and extract the full git commit message1316 like a p4 form. It just sees the Jobs: line as a marker1317 to pass everything from then on directly into the p4 form,1318 but outside the description section.13191320 Return a tuple (stripped log message, jobs string)."""13211322 m = re.search(r'^Jobs:', message, re.MULTILINE)1323if m is None:1324return(message,None)13251326 jobtext = message[m.start():]1327 stripped_message = message[:m.start()].rstrip()1328return(stripped_message, jobtext)13291330defprepareLogMessage(self, template, message, jobs):1331"""Edits the template returned from "p4 change -o" to insert1332 the message in the Description field, and the jobs text in1333 the Jobs field."""1334 result =""13351336 inDescriptionSection =False13371338for line in template.split("\n"):1339if line.startswith("#"):1340 result += line +"\n"1341continue13421343if inDescriptionSection:1344if line.startswith("Files:")or line.startswith("Jobs:"):1345 inDescriptionSection =False1346# insert Jobs section1347if jobs:1348 result += jobs +"\n"1349else:1350continue1351else:1352if line.startswith("Description:"):1353 inDescriptionSection =True1354 line +="\n"1355for messageLine in message.split("\n"):1356 line +="\t"+ messageLine +"\n"13571358 result += line +"\n"13591360return result13611362defpatchRCSKeywords(self,file, pattern):1363# Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern1364(handle, outFileName) = tempfile.mkstemp(dir='.')1365try:1366 outFile = os.fdopen(handle,"w+")1367 inFile =open(file,"r")1368 regexp = re.compile(pattern, re.VERBOSE)1369for line in inFile.readlines():1370 line = regexp.sub(r'$\1$', line)1371 outFile.write(line)1372 inFile.close()1373 outFile.close()1374# Forcibly overwrite the original file1375 os.unlink(file)1376 shutil.move(outFileName,file)1377except:1378# cleanup our temporary file1379 os.unlink(outFileName)1380print"Failed to strip RCS keywords in%s"%file1381raise13821383print"Patched up RCS keywords in%s"%file13841385defp4UserForCommit(self,id):1386# Return the tuple (perforce user,git email) for a given git commit id1387 self.getUserMapFromPerforceServer()1388 gitEmail =read_pipe(["git","log","--max-count=1",1389"--format=%ae",id])1390 gitEmail = gitEmail.strip()1391if not self.emails.has_key(gitEmail):1392return(None,gitEmail)1393else:1394return(self.emails[gitEmail],gitEmail)13951396defcheckValidP4Users(self,commits):1397# check if any git authors cannot be mapped to p4 users1398foridin commits:1399(user,email) = self.p4UserForCommit(id)1400if not user:1401 msg ="Cannot find p4 user for email%sin commit%s."% (email,id)1402ifgitConfigBool("git-p4.allowMissingP4Users"):1403print"%s"% msg1404else:1405die("Error:%s\nSet git-p4.allowMissingP4Users to true to allow this."% msg)14061407deflastP4Changelist(self):1408# Get back the last changelist number submitted in this client spec. This1409# then gets used to patch up the username in the change. If the same1410# client spec is being used by multiple processes then this might go1411# wrong.1412 results =p4CmdList("client -o")# find the current client1413 client =None1414for r in results:1415if r.has_key('Client'):1416 client = r['Client']1417break1418if not client:1419die("could not get client spec")1420 results =p4CmdList(["changes","-c", client,"-m","1"])1421for r in results:1422if r.has_key('change'):1423return r['change']1424die("Could not get changelist number for last submit - cannot patch up user details")14251426defmodifyChangelistUser(self, changelist, newUser):1427# fixup the user field of a changelist after it has been submitted.1428 changes =p4CmdList("change -o%s"% changelist)1429iflen(changes) !=1:1430die("Bad output from p4 change modifying%sto user%s"%1431(changelist, newUser))14321433 c = changes[0]1434if c['User'] == newUser:return# nothing to do1435 c['User'] = newUser1436input= marshal.dumps(c)14371438 result =p4CmdList("change -f -i", stdin=input)1439for r in result:1440if r.has_key('code'):1441if r['code'] =='error':1442die("Could not modify user field of changelist%sto%s:%s"% (changelist, newUser, r['data']))1443if r.has_key('data'):1444print("Updated user field for changelist%sto%s"% (changelist, newUser))1445return1446die("Could not modify user field of changelist%sto%s"% (changelist, newUser))14471448defcanChangeChangelists(self):1449# check to see if we have p4 admin or super-user permissions, either of1450# which are required to modify changelists.1451 results =p4CmdList(["protects", self.depotPath])1452for r in results:1453if r.has_key('perm'):1454if r['perm'] =='admin':1455return11456if r['perm'] =='super':1457return11458return014591460defprepareSubmitTemplate(self):1461"""Run "p4 change -o" to grab a change specification template.1462 This does not use "p4 -G", as it is nice to keep the submission1463 template in original order, since a human might edit it.14641465 Remove lines in the Files section that show changes to files1466 outside the depot path we're committing into."""14671468[upstream, settings] =findUpstreamBranchPoint()14691470 template =""1471 inFilesSection =False1472for line inp4_read_pipe_lines(['change','-o']):1473if line.endswith("\r\n"):1474 line = line[:-2] +"\n"1475if inFilesSection:1476if line.startswith("\t"):1477# path starts and ends with a tab1478 path = line[1:]1479 lastTab = path.rfind("\t")1480if lastTab != -1:1481 path = path[:lastTab]1482if settings.has_key('depot-paths'):1483if not[p for p in settings['depot-paths']1484ifp4PathStartsWith(path, p)]:1485continue1486else:1487if notp4PathStartsWith(path, self.depotPath):1488continue1489else:1490 inFilesSection =False1491else:1492if line.startswith("Files:"):1493 inFilesSection =True14941495 template += line14961497return template14981499defedit_template(self, template_file):1500"""Invoke the editor to let the user change the submission1501 message. Return true if okay to continue with the submit."""15021503# if configured to skip the editing part, just submit1504ifgitConfigBool("git-p4.skipSubmitEdit"):1505return True15061507# look at the modification time, to check later if the user saved1508# the file1509 mtime = os.stat(template_file).st_mtime15101511# invoke the editor1512if os.environ.has_key("P4EDITOR")and(os.environ.get("P4EDITOR") !=""):1513 editor = os.environ.get("P4EDITOR")1514else:1515 editor =read_pipe("git var GIT_EDITOR").strip()1516system(["sh","-c", ('%s"$@"'% editor), editor, template_file])15171518# If the file was not saved, prompt to see if this patch should1519# be skipped. But skip this verification step if configured so.1520ifgitConfigBool("git-p4.skipSubmitEditCheck"):1521return True15221523# modification time updated means user saved the file1524if os.stat(template_file).st_mtime > mtime:1525return True15261527while True:1528 response =raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")1529if response =='y':1530return True1531if response =='n':1532return False15331534defget_diff_description(self, editedFiles, filesToAdd):1535# diff1536if os.environ.has_key("P4DIFF"):1537del(os.environ["P4DIFF"])1538 diff =""1539for editedFile in editedFiles:1540 diff +=p4_read_pipe(['diff','-du',1541wildcard_encode(editedFile)])15421543# new file diff1544 newdiff =""1545for newFile in filesToAdd:1546 newdiff +="==== new file ====\n"1547 newdiff +="--- /dev/null\n"1548 newdiff +="+++%s\n"% newFile1549 f =open(newFile,"r")1550for line in f.readlines():1551 newdiff +="+"+ line1552 f.close()15531554return(diff + newdiff).replace('\r\n','\n')15551556defapplyCommit(self,id):1557"""Apply one commit, return True if it succeeded."""15581559print"Applying",read_pipe(["git","show","-s",1560"--format=format:%h%s",id])15611562(p4User, gitEmail) = self.p4UserForCommit(id)15631564 diff =read_pipe_lines("git diff-tree -r%s\"%s^\" \"%s\""% (self.diffOpts,id,id))1565 filesToAdd =set()1566 filesToChangeType =set()1567 filesToDelete =set()1568 editedFiles =set()1569 pureRenameCopy =set()1570 filesToChangeExecBit = {}15711572for line in diff:1573 diff =parseDiffTreeEntry(line)1574 modifier = diff['status']1575 path = diff['src']1576if modifier =="M":1577p4_edit(path)1578ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1579 filesToChangeExecBit[path] = diff['dst_mode']1580 editedFiles.add(path)1581elif modifier =="A":1582 filesToAdd.add(path)1583 filesToChangeExecBit[path] = diff['dst_mode']1584if path in filesToDelete:1585 filesToDelete.remove(path)1586elif modifier =="D":1587 filesToDelete.add(path)1588if path in filesToAdd:1589 filesToAdd.remove(path)1590elif modifier =="C":1591 src, dest = diff['src'], diff['dst']1592p4_integrate(src, dest)1593 pureRenameCopy.add(dest)1594if diff['src_sha1'] != diff['dst_sha1']:1595p4_edit(dest)1596 pureRenameCopy.discard(dest)1597ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1598p4_edit(dest)1599 pureRenameCopy.discard(dest)1600 filesToChangeExecBit[dest] = diff['dst_mode']1601if self.isWindows:1602# turn off read-only attribute1603 os.chmod(dest, stat.S_IWRITE)1604 os.unlink(dest)1605 editedFiles.add(dest)1606elif modifier =="R":1607 src, dest = diff['src'], diff['dst']1608if self.p4HasMoveCommand:1609p4_edit(src)# src must be open before move1610p4_move(src, dest)# opens for (move/delete, move/add)1611else:1612p4_integrate(src, dest)1613if diff['src_sha1'] != diff['dst_sha1']:1614p4_edit(dest)1615else:1616 pureRenameCopy.add(dest)1617ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1618if not self.p4HasMoveCommand:1619p4_edit(dest)# with move: already open, writable1620 filesToChangeExecBit[dest] = diff['dst_mode']1621if not self.p4HasMoveCommand:1622if self.isWindows:1623 os.chmod(dest, stat.S_IWRITE)1624 os.unlink(dest)1625 filesToDelete.add(src)1626 editedFiles.add(dest)1627elif modifier =="T":1628 filesToChangeType.add(path)1629else:1630die("unknown modifier%sfor%s"% (modifier, path))16311632 diffcmd ="git diff-tree --full-index -p\"%s\""% (id)1633 patchcmd = diffcmd +" | git apply "1634 tryPatchCmd = patchcmd +"--check -"1635 applyPatchCmd = patchcmd +"--check --apply -"1636 patch_succeeded =True16371638if os.system(tryPatchCmd) !=0:1639 fixed_rcs_keywords =False1640 patch_succeeded =False1641print"Unfortunately applying the change failed!"16421643# Patch failed, maybe it's just RCS keyword woes. Look through1644# the patch to see if that's possible.1645ifgitConfigBool("git-p4.attemptRCSCleanup"):1646file=None1647 pattern =None1648 kwfiles = {}1649forfilein editedFiles | filesToDelete:1650# did this file's delta contain RCS keywords?1651 pattern =p4_keywords_regexp_for_file(file)16521653if pattern:1654# this file is a possibility...look for RCS keywords.1655 regexp = re.compile(pattern, re.VERBOSE)1656for line inread_pipe_lines(["git","diff","%s^..%s"% (id,id),file]):1657if regexp.search(line):1658if verbose:1659print"got keyword match on%sin%sin%s"% (pattern, line,file)1660 kwfiles[file] = pattern1661break16621663forfilein kwfiles:1664if verbose:1665print"zapping%swith%s"% (line,pattern)1666# File is being deleted, so not open in p4. Must1667# disable the read-only bit on windows.1668if self.isWindows andfilenot in editedFiles:1669 os.chmod(file, stat.S_IWRITE)1670 self.patchRCSKeywords(file, kwfiles[file])1671 fixed_rcs_keywords =True16721673if fixed_rcs_keywords:1674print"Retrying the patch with RCS keywords cleaned up"1675if os.system(tryPatchCmd) ==0:1676 patch_succeeded =True16771678if not patch_succeeded:1679for f in editedFiles:1680p4_revert(f)1681return False16821683#1684# Apply the patch for real, and do add/delete/+x handling.1685#1686system(applyPatchCmd)16871688for f in filesToChangeType:1689p4_edit(f,"-t","auto")1690for f in filesToAdd:1691p4_add(f)1692for f in filesToDelete:1693p4_revert(f)1694p4_delete(f)16951696# Set/clear executable bits1697for f in filesToChangeExecBit.keys():1698 mode = filesToChangeExecBit[f]1699setP4ExecBit(f, mode)17001701#1702# Build p4 change description, starting with the contents1703# of the git commit message.1704#1705 logMessage =extractLogMessageFromGitCommit(id)1706 logMessage = logMessage.strip()1707(logMessage, jobs) = self.separate_jobs_from_description(logMessage)17081709 template = self.prepareSubmitTemplate()1710 submitTemplate = self.prepareLogMessage(template, logMessage, jobs)17111712if self.preserveUser:1713 submitTemplate +="\n######## Actual user%s, modified after commit\n"% p4User17141715if self.checkAuthorship and not self.p4UserIsMe(p4User):1716 submitTemplate +="######## git author%sdoes not match your p4 account.\n"% gitEmail1717 submitTemplate +="######## Use option --preserve-user to modify authorship.\n"1718 submitTemplate +="######## Variable git-p4.skipUserNameCheck hides this message.\n"17191720 separatorLine ="######## everything below this line is just the diff #######\n"1721if not self.prepare_p4_only:1722 submitTemplate += separatorLine1723 submitTemplate += self.get_diff_description(editedFiles, filesToAdd)17241725(handle, fileName) = tempfile.mkstemp()1726 tmpFile = os.fdopen(handle,"w+b")1727if self.isWindows:1728 submitTemplate = submitTemplate.replace("\n","\r\n")1729 tmpFile.write(submitTemplate)1730 tmpFile.close()17311732if self.prepare_p4_only:1733#1734# Leave the p4 tree prepared, and the submit template around1735# and let the user decide what to do next1736#1737print1738print"P4 workspace prepared for submission."1739print"To submit or revert, go to client workspace"1740print" "+ self.clientPath1741print1742print"To submit, use\"p4 submit\"to write a new description,"1743print"or\"p4 submit -i <%s\"to use the one prepared by" \1744"\"git p4\"."% fileName1745print"You can delete the file\"%s\"when finished."% fileName17461747if self.preserveUser and p4User and not self.p4UserIsMe(p4User):1748print"To preserve change ownership by user%s, you must\n" \1749"do\"p4 change -f <change>\"after submitting and\n" \1750"edit the User field."1751if pureRenameCopy:1752print"After submitting, renamed files must be re-synced."1753print"Invoke\"p4 sync -f\"on each of these files:"1754for f in pureRenameCopy:1755print" "+ f17561757print1758print"To revert the changes, use\"p4 revert ...\", and delete"1759print"the submit template file\"%s\""% fileName1760if filesToAdd:1761print"Since the commit adds new files, they must be deleted:"1762for f in filesToAdd:1763print" "+ f1764print1765return True17661767#1768# Let the user edit the change description, then submit it.1769#1770 submitted =False17711772try:1773if self.edit_template(fileName):1774# read the edited message and submit1775 tmpFile =open(fileName,"rb")1776 message = tmpFile.read()1777 tmpFile.close()1778if self.isWindows:1779 message = message.replace("\r\n","\n")1780 submitTemplate = message[:message.index(separatorLine)]1781p4_write_pipe(['submit','-i'], submitTemplate)17821783if self.preserveUser:1784if p4User:1785# Get last changelist number. Cannot easily get it from1786# the submit command output as the output is1787# unmarshalled.1788 changelist = self.lastP4Changelist()1789 self.modifyChangelistUser(changelist, p4User)17901791# The rename/copy happened by applying a patch that created a1792# new file. This leaves it writable, which confuses p4.1793for f in pureRenameCopy:1794p4_sync(f,"-f")1795 submitted =True17961797finally:1798# skip this patch1799if not submitted:1800print"Submission cancelled, undoing p4 changes."1801for f in editedFiles:1802p4_revert(f)1803for f in filesToAdd:1804p4_revert(f)1805 os.remove(f)1806for f in filesToDelete:1807p4_revert(f)18081809 os.remove(fileName)1810return submitted18111812# Export git tags as p4 labels. Create a p4 label and then tag1813# with that.1814defexportGitTags(self, gitTags):1815 validLabelRegexp =gitConfig("git-p4.labelExportRegexp")1816iflen(validLabelRegexp) ==0:1817 validLabelRegexp = defaultLabelRegexp1818 m = re.compile(validLabelRegexp)18191820for name in gitTags:18211822if not m.match(name):1823if verbose:1824print"tag%sdoes not match regexp%s"% (name, validLabelRegexp)1825continue18261827# Get the p4 commit this corresponds to1828 logMessage =extractLogMessageFromGitCommit(name)1829 values =extractSettingsGitLog(logMessage)18301831if not values.has_key('change'):1832# a tag pointing to something not sent to p4; ignore1833if verbose:1834print"git tag%sdoes not give a p4 commit"% name1835continue1836else:1837 changelist = values['change']18381839# Get the tag details.1840 inHeader =True1841 isAnnotated =False1842 body = []1843for l inread_pipe_lines(["git","cat-file","-p", name]):1844 l = l.strip()1845if inHeader:1846if re.match(r'tag\s+', l):1847 isAnnotated =True1848elif re.match(r'\s*$', l):1849 inHeader =False1850continue1851else:1852 body.append(l)18531854if not isAnnotated:1855 body = ["lightweight tag imported by git p4\n"]18561857# Create the label - use the same view as the client spec we are using1858 clientSpec =getClientSpec()18591860 labelTemplate ="Label:%s\n"% name1861 labelTemplate +="Description:\n"1862for b in body:1863 labelTemplate +="\t"+ b +"\n"1864 labelTemplate +="View:\n"1865for depot_side in clientSpec.mappings:1866 labelTemplate +="\t%s\n"% depot_side18671868if self.dry_run:1869print"Would create p4 label%sfor tag"% name1870elif self.prepare_p4_only:1871print"Not creating p4 label%sfor tag due to option" \1872" --prepare-p4-only"% name1873else:1874p4_write_pipe(["label","-i"], labelTemplate)18751876# Use the label1877p4_system(["tag","-l", name] +1878["%s@%s"% (depot_side, changelist)for depot_side in clientSpec.mappings])18791880if verbose:1881print"created p4 label for tag%s"% name18821883defrun(self, args):1884iflen(args) ==0:1885 self.master =currentGitBranch()1886eliflen(args) ==1:1887 self.master = args[0]1888if notbranchExists(self.master):1889die("Branch%sdoes not exist"% self.master)1890else:1891return False18921893if self.master:1894 allowSubmit =gitConfig("git-p4.allowSubmit")1895iflen(allowSubmit) >0and not self.master in allowSubmit.split(","):1896die("%sis not in git-p4.allowSubmit"% self.master)18971898[upstream, settings] =findUpstreamBranchPoint()1899 self.depotPath = settings['depot-paths'][0]1900iflen(self.origin) ==0:1901 self.origin = upstream19021903if self.preserveUser:1904if not self.canChangeChangelists():1905die("Cannot preserve user names without p4 super-user or admin permissions")19061907# if not set from the command line, try the config file1908if self.conflict_behavior is None:1909 val =gitConfig("git-p4.conflict")1910if val:1911if val not in self.conflict_behavior_choices:1912die("Invalid value '%s' for config git-p4.conflict"% val)1913else:1914 val ="ask"1915 self.conflict_behavior = val19161917if self.verbose:1918print"Origin branch is "+ self.origin19191920iflen(self.depotPath) ==0:1921print"Internal error: cannot locate perforce depot path from existing branches"1922 sys.exit(128)19231924 self.useClientSpec =False1925ifgitConfigBool("git-p4.useclientspec"):1926 self.useClientSpec =True1927if self.useClientSpec:1928 self.clientSpecDirs =getClientSpec()19291930# Check for the existance of P4 branches1931 branchesDetected = (len(p4BranchesInGit().keys()) >1)19321933if self.useClientSpec and not branchesDetected:1934# all files are relative to the client spec1935 self.clientPath =getClientRoot()1936else:1937 self.clientPath =p4Where(self.depotPath)19381939if self.clientPath =="":1940die("Error: Cannot locate perforce checkout of%sin client view"% self.depotPath)19411942print"Perforce checkout for depot path%slocated at%s"% (self.depotPath, self.clientPath)1943 self.oldWorkingDirectory = os.getcwd()19441945# ensure the clientPath exists1946 new_client_dir =False1947if not os.path.exists(self.clientPath):1948 new_client_dir =True1949 os.makedirs(self.clientPath)19501951chdir(self.clientPath, is_client_path=True)1952if self.dry_run:1953print"Would synchronize p4 checkout in%s"% self.clientPath1954else:1955print"Synchronizing p4 checkout..."1956if new_client_dir:1957# old one was destroyed, and maybe nobody told p41958p4_sync("...","-f")1959else:1960p4_sync("...")1961 self.check()19621963 commits = []1964if self.master:1965 commitish = self.master1966else:1967 commitish ='HEAD'19681969for line inread_pipe_lines(["git","rev-list","--no-merges","%s..%s"% (self.origin, commitish)]):1970 commits.append(line.strip())1971 commits.reverse()19721973if self.preserveUser orgitConfigBool("git-p4.skipUserNameCheck"):1974 self.checkAuthorship =False1975else:1976 self.checkAuthorship =True19771978if self.preserveUser:1979 self.checkValidP4Users(commits)19801981#1982# Build up a set of options to be passed to diff when1983# submitting each commit to p4.1984#1985if self.detectRenames:1986# command-line -M arg1987 self.diffOpts ="-M"1988else:1989# If not explicitly set check the config variable1990 detectRenames =gitConfig("git-p4.detectRenames")19911992if detectRenames.lower() =="false"or detectRenames =="":1993 self.diffOpts =""1994elif detectRenames.lower() =="true":1995 self.diffOpts ="-M"1996else:1997 self.diffOpts ="-M%s"% detectRenames19981999# no command-line arg for -C or --find-copies-harder, just2000# config variables2001 detectCopies =gitConfig("git-p4.detectCopies")2002if detectCopies.lower() =="false"or detectCopies =="":2003pass2004elif detectCopies.lower() =="true":2005 self.diffOpts +=" -C"2006else:2007 self.diffOpts +=" -C%s"% detectCopies20082009ifgitConfigBool("git-p4.detectCopiesHarder"):2010 self.diffOpts +=" --find-copies-harder"20112012#2013# Apply the commits, one at a time. On failure, ask if should2014# continue to try the rest of the patches, or quit.2015#2016if self.dry_run:2017print"Would apply"2018 applied = []2019 last =len(commits) -12020for i, commit inenumerate(commits):2021if self.dry_run:2022print" ",read_pipe(["git","show","-s",2023"--format=format:%h%s", commit])2024 ok =True2025else:2026 ok = self.applyCommit(commit)2027if ok:2028 applied.append(commit)2029else:2030if self.prepare_p4_only and i < last:2031print"Processing only the first commit due to option" \2032" --prepare-p4-only"2033break2034if i < last:2035 quit =False2036while True:2037# prompt for what to do, or use the option/variable2038if self.conflict_behavior =="ask":2039print"What do you want to do?"2040 response =raw_input("[s]kip this commit but apply"2041" the rest, or [q]uit? ")2042if not response:2043continue2044elif self.conflict_behavior =="skip":2045 response ="s"2046elif self.conflict_behavior =="quit":2047 response ="q"2048else:2049die("Unknown conflict_behavior '%s'"%2050 self.conflict_behavior)20512052if response[0] =="s":2053print"Skipping this commit, but applying the rest"2054break2055if response[0] =="q":2056print"Quitting"2057 quit =True2058break2059if quit:2060break20612062chdir(self.oldWorkingDirectory)20632064if self.dry_run:2065pass2066elif self.prepare_p4_only:2067pass2068eliflen(commits) ==len(applied):2069print"All commits applied!"20702071 sync =P4Sync()2072if self.branch:2073 sync.branch = self.branch2074 sync.run([])20752076 rebase =P4Rebase()2077 rebase.rebase()20782079else:2080iflen(applied) ==0:2081print"No commits applied."2082else:2083print"Applied only the commits marked with '*':"2084for c in commits:2085if c in applied:2086 star ="*"2087else:2088 star =" "2089print star,read_pipe(["git","show","-s",2090"--format=format:%h%s", c])2091print"You will have to do 'git p4 sync' and rebase."20922093ifgitConfigBool("git-p4.exportLabels"):2094 self.exportLabels =True20952096if self.exportLabels:2097 p4Labels =getP4Labels(self.depotPath)2098 gitTags =getGitTags()20992100 missingGitTags = gitTags - p4Labels2101 self.exportGitTags(missingGitTags)21022103# exit with error unless everything applied perfectly2104iflen(commits) !=len(applied):2105 sys.exit(1)21062107return True21082109classView(object):2110"""Represent a p4 view ("p4 help views"), and map files in a2111 repo according to the view."""21122113def__init__(self, client_name):2114 self.mappings = []2115 self.client_prefix ="//%s/"% client_name2116# cache results of "p4 where" to lookup client file locations2117 self.client_spec_path_cache = {}21182119defappend(self, view_line):2120"""Parse a view line, splitting it into depot and client2121 sides. Append to self.mappings, preserving order. This2122 is only needed for tag creation."""21232124# Split the view line into exactly two words. P4 enforces2125# structure on these lines that simplifies this quite a bit.2126#2127# Either or both words may be double-quoted.2128# Single quotes do not matter.2129# Double-quote marks cannot occur inside the words.2130# A + or - prefix is also inside the quotes.2131# There are no quotes unless they contain a space.2132# The line is already white-space stripped.2133# The two words are separated by a single space.2134#2135if view_line[0] =='"':2136# First word is double quoted. Find its end.2137 close_quote_index = view_line.find('"',1)2138if close_quote_index <=0:2139die("No first-word closing quote found:%s"% view_line)2140 depot_side = view_line[1:close_quote_index]2141# skip closing quote and space2142 rhs_index = close_quote_index +1+12143else:2144 space_index = view_line.find(" ")2145if space_index <=0:2146die("No word-splitting space found:%s"% view_line)2147 depot_side = view_line[0:space_index]2148 rhs_index = space_index +121492150# prefix + means overlay on previous mapping2151if depot_side.startswith("+"):2152 depot_side = depot_side[1:]21532154# prefix - means exclude this path, leave out of mappings2155 exclude =False2156if depot_side.startswith("-"):2157 exclude =True2158 depot_side = depot_side[1:]21592160if not exclude:2161 self.mappings.append(depot_side)21622163defconvert_client_path(self, clientFile):2164# chop off //client/ part to make it relative2165if not clientFile.startswith(self.client_prefix):2166die("No prefix '%s' on clientFile '%s'"%2167(self.client_prefix, clientFile))2168return clientFile[len(self.client_prefix):]21692170defupdate_client_spec_path_cache(self, files):2171""" Caching file paths by "p4 where" batch query """21722173# List depot file paths exclude that already cached2174 fileArgs = [f['path']for f in files if f['path']not in self.client_spec_path_cache]21752176iflen(fileArgs) ==0:2177return# All files in cache21782179 where_result =p4CmdList(["-x","-","where"], stdin=fileArgs)2180for res in where_result:2181if"code"in res and res["code"] =="error":2182# assume error is "... file(s) not in client view"2183continue2184if"clientFile"not in res:2185die("No clientFile in 'p4 where' output")2186if"unmap"in res:2187# it will list all of them, but only one not unmap-ped2188continue2189ifgitConfigBool("core.ignorecase"):2190 res['depotFile'] = res['depotFile'].lower()2191 self.client_spec_path_cache[res['depotFile']] = self.convert_client_path(res["clientFile"])21922193# not found files or unmap files set to ""2194for depotFile in fileArgs:2195ifgitConfigBool("core.ignorecase"):2196 depotFile = depotFile.lower()2197if depotFile not in self.client_spec_path_cache:2198 self.client_spec_path_cache[depotFile] =""21992200defmap_in_client(self, depot_path):2201"""Return the relative location in the client where this2202 depot file should live. Returns "" if the file should2203 not be mapped in the client."""22042205ifgitConfigBool("core.ignorecase"):2206 depot_path = depot_path.lower()22072208if depot_path in self.client_spec_path_cache:2209return self.client_spec_path_cache[depot_path]22102211die("Error:%sis not found in client spec path"% depot_path )2212return""22132214classP4Sync(Command, P4UserMap):2215 delete_actions = ("delete","move/delete","purge")22162217def__init__(self):2218 Command.__init__(self)2219 P4UserMap.__init__(self)2220 self.options = [2221 optparse.make_option("--branch", dest="branch"),2222 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),2223 optparse.make_option("--changesfile", dest="changesFile"),2224 optparse.make_option("--silent", dest="silent", action="store_true"),2225 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),2226 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),2227 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",2228help="Import into refs/heads/ , not refs/remotes"),2229 optparse.make_option("--max-changes", dest="maxChanges",2230help="Maximum number of changes to import"),2231 optparse.make_option("--changes-block-size", dest="changes_block_size",type="int",2232help="Internal block size to use when iteratively calling p4 changes"),2233 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',2234help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),2235 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',2236help="Only sync files that are included in the Perforce Client Spec"),2237 optparse.make_option("-/", dest="cloneExclude",2238 action="append",type="string",2239help="exclude depot path"),2240]2241 self.description ="""Imports from Perforce into a git repository.\n2242 example:2243 //depot/my/project/ -- to import the current head2244 //depot/my/project/@all -- to import everything2245 //depot/my/project/@1,6 -- to import only from revision 1 to 622462247 (a ... is not needed in the path p4 specification, it's added implicitly)"""22482249 self.usage +=" //depot/path[@revRange]"2250 self.silent =False2251 self.createdBranches =set()2252 self.committedChanges =set()2253 self.branch =""2254 self.detectBranches =False2255 self.detectLabels =False2256 self.importLabels =False2257 self.changesFile =""2258 self.syncWithOrigin =True2259 self.importIntoRemotes =True2260 self.maxChanges =""2261 self.changes_block_size =None2262 self.keepRepoPath =False2263 self.depotPaths =None2264 self.p4BranchesInGit = []2265 self.cloneExclude = []2266 self.useClientSpec =False2267 self.useClientSpec_from_options =False2268 self.clientSpecDirs =None2269 self.tempBranches = []2270 self.tempBranchLocation ="git-p4-tmp"2271 self.largeFileSystem =None22722273ifgitConfig('git-p4.largeFileSystem'):2274 largeFileSystemConstructor =globals()[gitConfig('git-p4.largeFileSystem')]2275 self.largeFileSystem =largeFileSystemConstructor(2276lambda git_mode, relPath, contents: self.writeToGitStream(git_mode, relPath, contents)2277)22782279ifgitConfig("git-p4.syncFromOrigin") =="false":2280 self.syncWithOrigin =False22812282# This is required for the "append" cloneExclude action2283defensure_value(self, attr, value):2284if nothasattr(self, attr)orgetattr(self, attr)is None:2285setattr(self, attr, value)2286returngetattr(self, attr)22872288# Force a checkpoint in fast-import and wait for it to finish2289defcheckpoint(self):2290 self.gitStream.write("checkpoint\n\n")2291 self.gitStream.write("progress checkpoint\n\n")2292 out = self.gitOutput.readline()2293if self.verbose:2294print"checkpoint finished: "+ out22952296defextractFilesFromCommit(self, commit):2297 self.cloneExclude = [re.sub(r"\.\.\.$","", path)2298for path in self.cloneExclude]2299 files = []2300 fnum =02301while commit.has_key("depotFile%s"% fnum):2302 path = commit["depotFile%s"% fnum]23032304if[p for p in self.cloneExclude2305ifp4PathStartsWith(path, p)]:2306 found =False2307else:2308 found = [p for p in self.depotPaths2309ifp4PathStartsWith(path, p)]2310if not found:2311 fnum = fnum +12312continue23132314file= {}2315file["path"] = path2316file["rev"] = commit["rev%s"% fnum]2317file["action"] = commit["action%s"% fnum]2318file["type"] = commit["type%s"% fnum]2319 files.append(file)2320 fnum = fnum +12321return files23222323defstripRepoPath(self, path, prefixes):2324"""When streaming files, this is called to map a p4 depot path2325 to where it should go in git. The prefixes are either2326 self.depotPaths, or self.branchPrefixes in the case of2327 branch detection."""23282329if self.useClientSpec:2330# branch detection moves files up a level (the branch name)2331# from what client spec interpretation gives2332 path = self.clientSpecDirs.map_in_client(path)2333if self.detectBranches:2334for b in self.knownBranches:2335if path.startswith(b +"/"):2336 path = path[len(b)+1:]23372338elif self.keepRepoPath:2339# Preserve everything in relative path name except leading2340# //depot/; just look at first prefix as they all should2341# be in the same depot.2342 depot = re.sub("^(//[^/]+/).*", r'\1', prefixes[0])2343ifp4PathStartsWith(path, depot):2344 path = path[len(depot):]23452346else:2347for p in prefixes:2348ifp4PathStartsWith(path, p):2349 path = path[len(p):]2350break23512352 path =wildcard_decode(path)2353return path23542355defsplitFilesIntoBranches(self, commit):2356"""Look at each depotFile in the commit to figure out to what2357 branch it belongs."""23582359if self.clientSpecDirs:2360 files = self.extractFilesFromCommit(commit)2361 self.clientSpecDirs.update_client_spec_path_cache(files)23622363 branches = {}2364 fnum =02365while commit.has_key("depotFile%s"% fnum):2366 path = commit["depotFile%s"% fnum]2367 found = [p for p in self.depotPaths2368ifp4PathStartsWith(path, p)]2369if not found:2370 fnum = fnum +12371continue23722373file= {}2374file["path"] = path2375file["rev"] = commit["rev%s"% fnum]2376file["action"] = commit["action%s"% fnum]2377file["type"] = commit["type%s"% fnum]2378 fnum = fnum +123792380# start with the full relative path where this file would2381# go in a p4 client2382if self.useClientSpec:2383 relPath = self.clientSpecDirs.map_in_client(path)2384else:2385 relPath = self.stripRepoPath(path, self.depotPaths)23862387for branch in self.knownBranches.keys():2388# add a trailing slash so that a commit into qt/4.2foo2389# doesn't end up in qt/4.2, e.g.2390if relPath.startswith(branch +"/"):2391if branch not in branches:2392 branches[branch] = []2393 branches[branch].append(file)2394break23952396return branches23972398defwriteToGitStream(self, gitMode, relPath, contents):2399 self.gitStream.write('M%sinline%s\n'% (gitMode, relPath))2400 self.gitStream.write('data%d\n'%sum(len(d)for d in contents))2401for d in contents:2402 self.gitStream.write(d)2403 self.gitStream.write('\n')24042405# output one file from the P4 stream2406# - helper for streamP4Files24072408defstreamOneP4File(self,file, contents):2409 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)2410if verbose:2411 size =int(self.stream_file['fileSize'])2412 sys.stdout.write('\r%s-->%s(%iMB)\n'% (file['depotFile'], relPath, size/1024/1024))2413 sys.stdout.flush()24142415(type_base, type_mods) =split_p4_type(file["type"])24162417 git_mode ="100644"2418if"x"in type_mods:2419 git_mode ="100755"2420if type_base =="symlink":2421 git_mode ="120000"2422# p4 print on a symlink sometimes contains "target\n";2423# if it does, remove the newline2424 data =''.join(contents)2425if not data:2426# Some version of p4 allowed creating a symlink that pointed2427# to nothing. This causes p4 errors when checking out such2428# a change, and errors here too. Work around it by ignoring2429# the bad symlink; hopefully a future change fixes it.2430print"\nIgnoring empty symlink in%s"%file['depotFile']2431return2432elif data[-1] =='\n':2433 contents = [data[:-1]]2434else:2435 contents = [data]24362437if type_base =="utf16":2438# p4 delivers different text in the python output to -G2439# than it does when using "print -o", or normal p4 client2440# operations. utf16 is converted to ascii or utf8, perhaps.2441# But ascii text saved as -t utf16 is completely mangled.2442# Invoke print -o to get the real contents.2443#2444# On windows, the newlines will always be mangled by print, so put2445# them back too. This is not needed to the cygwin windows version,2446# just the native "NT" type.2447#2448try:2449 text =p4_read_pipe(['print','-q','-o','-','%s@%s'% (file['depotFile'],file['change'])])2450exceptExceptionas e:2451if'Translation of file content failed'instr(e):2452 type_base ='binary'2453else:2454raise e2455else:2456ifp4_version_string().find('/NT') >=0:2457 text = text.replace('\r\n','\n')2458 contents = [ text ]24592460if type_base =="apple":2461# Apple filetype files will be streamed as a concatenation of2462# its appledouble header and the contents. This is useless2463# on both macs and non-macs. If using "print -q -o xx", it2464# will create "xx" with the data, and "%xx" with the header.2465# This is also not very useful.2466#2467# Ideally, someday, this script can learn how to generate2468# appledouble files directly and import those to git, but2469# non-mac machines can never find a use for apple filetype.2470print"\nIgnoring apple filetype file%s"%file['depotFile']2471return24722473# Note that we do not try to de-mangle keywords on utf16 files,2474# even though in theory somebody may want that.2475 pattern =p4_keywords_regexp_for_type(type_base, type_mods)2476if pattern:2477 regexp = re.compile(pattern, re.VERBOSE)2478 text =''.join(contents)2479 text = regexp.sub(r'$\1$', text)2480 contents = [ text ]24812482try:2483 relPath.decode('ascii')2484except:2485 encoding ='utf8'2486ifgitConfig('git-p4.pathEncoding'):2487 encoding =gitConfig('git-p4.pathEncoding')2488 relPath = relPath.decode(encoding,'replace').encode('utf8','replace')2489if self.verbose:2490print'Path with non-ASCII characters detected. Used%sto encode:%s'% (encoding, relPath)24912492if self.largeFileSystem:2493(git_mode, contents) = self.largeFileSystem.processContent(git_mode, relPath, contents)24942495 self.writeToGitStream(git_mode, relPath, contents)24962497defstreamOneP4Deletion(self,file):2498 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)2499if verbose:2500 sys.stdout.write("delete%s\n"% relPath)2501 sys.stdout.flush()2502 self.gitStream.write("D%s\n"% relPath)25032504if self.largeFileSystem and self.largeFileSystem.isLargeFile(relPath):2505 self.largeFileSystem.removeLargeFile(relPath)25062507# handle another chunk of streaming data2508defstreamP4FilesCb(self, marshalled):25092510# catch p4 errors and complain2511 err =None2512if"code"in marshalled:2513if marshalled["code"] =="error":2514if"data"in marshalled:2515 err = marshalled["data"].rstrip()25162517if not err and'fileSize'in self.stream_file:2518 required_bytes =int((4*int(self.stream_file["fileSize"])) -calcDiskFree())2519if required_bytes >0:2520 err ='Not enough space left on%s! Free at least%iMB.'% (2521 os.getcwd(), required_bytes/1024/10242522)25232524if err:2525 f =None2526if self.stream_have_file_info:2527if"depotFile"in self.stream_file:2528 f = self.stream_file["depotFile"]2529# force a failure in fast-import, else an empty2530# commit will be made2531 self.gitStream.write("\n")2532 self.gitStream.write("die-now\n")2533 self.gitStream.close()2534# ignore errors, but make sure it exits first2535 self.importProcess.wait()2536if f:2537die("Error from p4 print for%s:%s"% (f, err))2538else:2539die("Error from p4 print:%s"% err)25402541if marshalled.has_key('depotFile')and self.stream_have_file_info:2542# start of a new file - output the old one first2543 self.streamOneP4File(self.stream_file, self.stream_contents)2544 self.stream_file = {}2545 self.stream_contents = []2546 self.stream_have_file_info =False25472548# pick up the new file information... for the2549# 'data' field we need to append to our array2550for k in marshalled.keys():2551if k =='data':2552if'streamContentSize'not in self.stream_file:2553 self.stream_file['streamContentSize'] =02554 self.stream_file['streamContentSize'] +=len(marshalled['data'])2555 self.stream_contents.append(marshalled['data'])2556else:2557 self.stream_file[k] = marshalled[k]25582559if(verbose and2560'streamContentSize'in self.stream_file and2561'fileSize'in self.stream_file and2562'depotFile'in self.stream_file):2563 size =int(self.stream_file["fileSize"])2564if size >0:2565 progress =100*self.stream_file['streamContentSize']/size2566 sys.stdout.write('\r%s %d%%(%iMB)'% (self.stream_file['depotFile'], progress,int(size/1024/1024)))2567 sys.stdout.flush()25682569 self.stream_have_file_info =True25702571# Stream directly from "p4 files" into "git fast-import"2572defstreamP4Files(self, files):2573 filesForCommit = []2574 filesToRead = []2575 filesToDelete = []25762577for f in files:2578 filesForCommit.append(f)2579if f['action']in self.delete_actions:2580 filesToDelete.append(f)2581else:2582 filesToRead.append(f)25832584# deleted files...2585for f in filesToDelete:2586 self.streamOneP4Deletion(f)25872588iflen(filesToRead) >0:2589 self.stream_file = {}2590 self.stream_contents = []2591 self.stream_have_file_info =False25922593# curry self argument2594defstreamP4FilesCbSelf(entry):2595 self.streamP4FilesCb(entry)25962597 fileArgs = ['%s#%s'% (f['path'], f['rev'])for f in filesToRead]25982599p4CmdList(["-x","-","print"],2600 stdin=fileArgs,2601 cb=streamP4FilesCbSelf)26022603# do the last chunk2604if self.stream_file.has_key('depotFile'):2605 self.streamOneP4File(self.stream_file, self.stream_contents)26062607defmake_email(self, userid):2608if userid in self.users:2609return self.users[userid]2610else:2611return"%s<a@b>"% userid26122613defstreamTag(self, gitStream, labelName, labelDetails, commit, epoch):2614""" Stream a p4 tag.2615 commit is either a git commit, or a fast-import mark, ":<p4commit>"2616 """26172618if verbose:2619print"writing tag%sfor commit%s"% (labelName, commit)2620 gitStream.write("tag%s\n"% labelName)2621 gitStream.write("from%s\n"% commit)26222623if labelDetails.has_key('Owner'):2624 owner = labelDetails["Owner"]2625else:2626 owner =None26272628# Try to use the owner of the p4 label, or failing that,2629# the current p4 user id.2630if owner:2631 email = self.make_email(owner)2632else:2633 email = self.make_email(self.p4UserId())2634 tagger ="%s %s %s"% (email, epoch, self.tz)26352636 gitStream.write("tagger%s\n"% tagger)26372638print"labelDetails=",labelDetails2639if labelDetails.has_key('Description'):2640 description = labelDetails['Description']2641else:2642 description ='Label from git p4'26432644 gitStream.write("data%d\n"%len(description))2645 gitStream.write(description)2646 gitStream.write("\n")26472648definClientSpec(self, path):2649if not self.clientSpecDirs:2650return True2651 inClientSpec = self.clientSpecDirs.map_in_client(path)2652if not inClientSpec and self.verbose:2653print('Ignoring file outside of client spec:{0}'.format(path))2654return inClientSpec26552656defhasBranchPrefix(self, path):2657if not self.branchPrefixes:2658return True2659 hasPrefix = [p for p in self.branchPrefixes2660ifp4PathStartsWith(path, p)]2661if hasPrefix and self.verbose:2662print('Ignoring file outside of prefix:{0}'.format(path))2663return hasPrefix26642665defcommit(self, details, files, branch, parent =""):2666 epoch = details["time"]2667 author = details["user"]26682669if self.verbose:2670print('commit into{0}'.format(branch))26712672if self.clientSpecDirs:2673 self.clientSpecDirs.update_client_spec_path_cache(files)26742675 files = [f for f in files2676if self.inClientSpec(f['path'])and self.hasBranchPrefix(f['path'])]26772678if not files and notgitConfigBool('git-p4.keepEmptyCommits'):2679print('Ignoring revision{0}as it would produce an empty commit.'2680.format(details['change']))2681return26822683 self.gitStream.write("commit%s\n"% branch)2684 self.gitStream.write("mark :%s\n"% details["change"])2685 self.committedChanges.add(int(details["change"]))2686 committer =""2687if author not in self.users:2688 self.getUserMapFromPerforceServer()2689 committer ="%s %s %s"% (self.make_email(author), epoch, self.tz)26902691 self.gitStream.write("committer%s\n"% committer)26922693 self.gitStream.write("data <<EOT\n")2694 self.gitStream.write(details["desc"])2695 self.gitStream.write("\n[git-p4: depot-paths =\"%s\": change =%s"%2696(','.join(self.branchPrefixes), details["change"]))2697iflen(details['options']) >0:2698 self.gitStream.write(": options =%s"% details['options'])2699 self.gitStream.write("]\nEOT\n\n")27002701iflen(parent) >0:2702if self.verbose:2703print"parent%s"% parent2704 self.gitStream.write("from%s\n"% parent)27052706 self.streamP4Files(files)2707 self.gitStream.write("\n")27082709 change =int(details["change"])27102711if self.labels.has_key(change):2712 label = self.labels[change]2713 labelDetails = label[0]2714 labelRevisions = label[1]2715if self.verbose:2716print"Change%sis labelled%s"% (change, labelDetails)27172718 files =p4CmdList(["files"] + ["%s...@%s"% (p, change)2719for p in self.branchPrefixes])27202721iflen(files) ==len(labelRevisions):27222723 cleanedFiles = {}2724for info in files:2725if info["action"]in self.delete_actions:2726continue2727 cleanedFiles[info["depotFile"]] = info["rev"]27282729if cleanedFiles == labelRevisions:2730 self.streamTag(self.gitStream,'tag_%s'% labelDetails['label'], labelDetails, branch, epoch)27312732else:2733if not self.silent:2734print("Tag%sdoes not match with change%s: files do not match."2735% (labelDetails["label"], change))27362737else:2738if not self.silent:2739print("Tag%sdoes not match with change%s: file count is different."2740% (labelDetails["label"], change))27412742# Build a dictionary of changelists and labels, for "detect-labels" option.2743defgetLabels(self):2744 self.labels = {}27452746 l =p4CmdList(["labels"] + ["%s..."% p for p in self.depotPaths])2747iflen(l) >0and not self.silent:2748print"Finding files belonging to labels in%s"% `self.depotPaths`27492750for output in l:2751 label = output["label"]2752 revisions = {}2753 newestChange =02754if self.verbose:2755print"Querying files for label%s"% label2756forfileinp4CmdList(["files"] +2757["%s...@%s"% (p, label)2758for p in self.depotPaths]):2759 revisions[file["depotFile"]] =file["rev"]2760 change =int(file["change"])2761if change > newestChange:2762 newestChange = change27632764 self.labels[newestChange] = [output, revisions]27652766if self.verbose:2767print"Label changes:%s"% self.labels.keys()27682769# Import p4 labels as git tags. A direct mapping does not2770# exist, so assume that if all the files are at the same revision2771# then we can use that, or it's something more complicated we should2772# just ignore.2773defimportP4Labels(self, stream, p4Labels):2774if verbose:2775print"import p4 labels: "+' '.join(p4Labels)27762777 ignoredP4Labels =gitConfigList("git-p4.ignoredP4Labels")2778 validLabelRegexp =gitConfig("git-p4.labelImportRegexp")2779iflen(validLabelRegexp) ==0:2780 validLabelRegexp = defaultLabelRegexp2781 m = re.compile(validLabelRegexp)27822783for name in p4Labels:2784 commitFound =False27852786if not m.match(name):2787if verbose:2788print"label%sdoes not match regexp%s"% (name,validLabelRegexp)2789continue27902791if name in ignoredP4Labels:2792continue27932794 labelDetails =p4CmdList(['label',"-o", name])[0]27952796# get the most recent changelist for each file in this label2797 change =p4Cmd(["changes","-m","1"] + ["%s...@%s"% (p, name)2798for p in self.depotPaths])27992800if change.has_key('change'):2801# find the corresponding git commit; take the oldest commit2802 changelist =int(change['change'])2803if changelist in self.committedChanges:2804 gitCommit =":%d"% changelist # use a fast-import mark2805 commitFound =True2806else:2807 gitCommit =read_pipe(["git","rev-list","--max-count=1",2808"--reverse",":/\[git-p4:.*change =%d\]"% changelist], ignore_error=True)2809iflen(gitCommit) ==0:2810print"importing label%s: could not find git commit for changelist%d"% (name, changelist)2811else:2812 commitFound =True2813 gitCommit = gitCommit.strip()28142815if commitFound:2816# Convert from p4 time format2817try:2818 tmwhen = time.strptime(labelDetails['Update'],"%Y/%m/%d%H:%M:%S")2819exceptValueError:2820print"Could not convert label time%s"% labelDetails['Update']2821 tmwhen =128222823 when =int(time.mktime(tmwhen))2824 self.streamTag(stream, name, labelDetails, gitCommit, when)2825if verbose:2826print"p4 label%smapped to git commit%s"% (name, gitCommit)2827else:2828if verbose:2829print"Label%shas no changelists - possibly deleted?"% name28302831if not commitFound:2832# We can't import this label; don't try again as it will get very2833# expensive repeatedly fetching all the files for labels that will2834# never be imported. If the label is moved in the future, the2835# ignore will need to be removed manually.2836system(["git","config","--add","git-p4.ignoredP4Labels", name])28372838defguessProjectName(self):2839for p in self.depotPaths:2840if p.endswith("/"):2841 p = p[:-1]2842 p = p[p.strip().rfind("/") +1:]2843if not p.endswith("/"):2844 p +="/"2845return p28462847defgetBranchMapping(self):2848 lostAndFoundBranches =set()28492850 user =gitConfig("git-p4.branchUser")2851iflen(user) >0:2852 command ="branches -u%s"% user2853else:2854 command ="branches"28552856for info inp4CmdList(command):2857 details =p4Cmd(["branch","-o", info["branch"]])2858 viewIdx =02859while details.has_key("View%s"% viewIdx):2860 paths = details["View%s"% viewIdx].split(" ")2861 viewIdx = viewIdx +12862# require standard //depot/foo/... //depot/bar/... mapping2863iflen(paths) !=2or not paths[0].endswith("/...")or not paths[1].endswith("/..."):2864continue2865 source = paths[0]2866 destination = paths[1]2867## HACK2868ifp4PathStartsWith(source, self.depotPaths[0])andp4PathStartsWith(destination, self.depotPaths[0]):2869 source = source[len(self.depotPaths[0]):-4]2870 destination = destination[len(self.depotPaths[0]):-4]28712872if destination in self.knownBranches:2873if not self.silent:2874print"p4 branch%sdefines a mapping from%sto%s"% (info["branch"], source, destination)2875print"but there exists another mapping from%sto%salready!"% (self.knownBranches[destination], destination)2876continue28772878 self.knownBranches[destination] = source28792880 lostAndFoundBranches.discard(destination)28812882if source not in self.knownBranches:2883 lostAndFoundBranches.add(source)28842885# Perforce does not strictly require branches to be defined, so we also2886# check git config for a branch list.2887#2888# Example of branch definition in git config file:2889# [git-p4]2890# branchList=main:branchA2891# branchList=main:branchB2892# branchList=branchA:branchC2893 configBranches =gitConfigList("git-p4.branchList")2894for branch in configBranches:2895if branch:2896(source, destination) = branch.split(":")2897 self.knownBranches[destination] = source28982899 lostAndFoundBranches.discard(destination)29002901if source not in self.knownBranches:2902 lostAndFoundBranches.add(source)290329042905for branch in lostAndFoundBranches:2906 self.knownBranches[branch] = branch29072908defgetBranchMappingFromGitBranches(self):2909 branches =p4BranchesInGit(self.importIntoRemotes)2910for branch in branches.keys():2911if branch =="master":2912 branch ="main"2913else:2914 branch = branch[len(self.projectName):]2915 self.knownBranches[branch] = branch29162917defupdateOptionDict(self, d):2918 option_keys = {}2919if self.keepRepoPath:2920 option_keys['keepRepoPath'] =129212922 d["options"] =' '.join(sorted(option_keys.keys()))29232924defreadOptions(self, d):2925 self.keepRepoPath = (d.has_key('options')2926and('keepRepoPath'in d['options']))29272928defgitRefForBranch(self, branch):2929if branch =="main":2930return self.refPrefix +"master"29312932iflen(branch) <=0:2933return branch29342935return self.refPrefix + self.projectName + branch29362937defgitCommitByP4Change(self, ref, change):2938if self.verbose:2939print"looking in ref "+ ref +" for change%susing bisect..."% change29402941 earliestCommit =""2942 latestCommit =parseRevision(ref)29432944while True:2945if self.verbose:2946print"trying: earliest%slatest%s"% (earliestCommit, latestCommit)2947 next =read_pipe("git rev-list --bisect%s %s"% (latestCommit, earliestCommit)).strip()2948iflen(next) ==0:2949if self.verbose:2950print"argh"2951return""2952 log =extractLogMessageFromGitCommit(next)2953 settings =extractSettingsGitLog(log)2954 currentChange =int(settings['change'])2955if self.verbose:2956print"current change%s"% currentChange29572958if currentChange == change:2959if self.verbose:2960print"found%s"% next2961return next29622963if currentChange < change:2964 earliestCommit ="^%s"% next2965else:2966 latestCommit ="%s"% next29672968return""29692970defimportNewBranch(self, branch, maxChange):2971# make fast-import flush all changes to disk and update the refs using the checkpoint2972# command so that we can try to find the branch parent in the git history2973 self.gitStream.write("checkpoint\n\n");2974 self.gitStream.flush();2975 branchPrefix = self.depotPaths[0] + branch +"/"2976range="@1,%s"% maxChange2977#print "prefix" + branchPrefix2978 changes =p4ChangesForPaths([branchPrefix],range, self.changes_block_size)2979iflen(changes) <=0:2980return False2981 firstChange = changes[0]2982#print "first change in branch: %s" % firstChange2983 sourceBranch = self.knownBranches[branch]2984 sourceDepotPath = self.depotPaths[0] + sourceBranch2985 sourceRef = self.gitRefForBranch(sourceBranch)2986#print "source " + sourceBranch29872988 branchParentChange =int(p4Cmd(["changes","-m","1","%s...@1,%s"% (sourceDepotPath, firstChange)])["change"])2989#print "branch parent: %s" % branchParentChange2990 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)2991iflen(gitParent) >0:2992 self.initialParents[self.gitRefForBranch(branch)] = gitParent2993#print "parent git commit: %s" % gitParent29942995 self.importChanges(changes)2996return True29972998defsearchParent(self, parent, branch, target):2999 parentFound =False3000for blob inread_pipe_lines(["git","rev-list","--reverse",3001"--no-merges", parent]):3002 blob = blob.strip()3003iflen(read_pipe(["git","diff-tree", blob, target])) ==0:3004 parentFound =True3005if self.verbose:3006print"Found parent of%sin commit%s"% (branch, blob)3007break3008if parentFound:3009return blob3010else:3011return None30123013defimportChanges(self, changes):3014 cnt =13015for change in changes:3016 description =p4_describe(change)3017 self.updateOptionDict(description)30183019if not self.silent:3020 sys.stdout.write("\rImporting revision%s(%s%%)"% (change, cnt *100/len(changes)))3021 sys.stdout.flush()3022 cnt = cnt +130233024try:3025if self.detectBranches:3026 branches = self.splitFilesIntoBranches(description)3027for branch in branches.keys():3028## HACK --hwn3029 branchPrefix = self.depotPaths[0] + branch +"/"3030 self.branchPrefixes = [ branchPrefix ]30313032 parent =""30333034 filesForCommit = branches[branch]30353036if self.verbose:3037print"branch is%s"% branch30383039 self.updatedBranches.add(branch)30403041if branch not in self.createdBranches:3042 self.createdBranches.add(branch)3043 parent = self.knownBranches[branch]3044if parent == branch:3045 parent =""3046else:3047 fullBranch = self.projectName + branch3048if fullBranch not in self.p4BranchesInGit:3049if not self.silent:3050print("\nImporting new branch%s"% fullBranch);3051if self.importNewBranch(branch, change -1):3052 parent =""3053 self.p4BranchesInGit.append(fullBranch)3054if not self.silent:3055print("\nResuming with change%s"% change);30563057if self.verbose:3058print"parent determined through known branches:%s"% parent30593060 branch = self.gitRefForBranch(branch)3061 parent = self.gitRefForBranch(parent)30623063if self.verbose:3064print"looking for initial parent for%s; current parent is%s"% (branch, parent)30653066iflen(parent) ==0and branch in self.initialParents:3067 parent = self.initialParents[branch]3068del self.initialParents[branch]30693070 blob =None3071iflen(parent) >0:3072 tempBranch ="%s/%d"% (self.tempBranchLocation, change)3073if self.verbose:3074print"Creating temporary branch: "+ tempBranch3075 self.commit(description, filesForCommit, tempBranch)3076 self.tempBranches.append(tempBranch)3077 self.checkpoint()3078 blob = self.searchParent(parent, branch, tempBranch)3079if blob:3080 self.commit(description, filesForCommit, branch, blob)3081else:3082if self.verbose:3083print"Parent of%snot found. Committing into head of%s"% (branch, parent)3084 self.commit(description, filesForCommit, branch, parent)3085else:3086 files = self.extractFilesFromCommit(description)3087 self.commit(description, files, self.branch,3088 self.initialParent)3089# only needed once, to connect to the previous commit3090 self.initialParent =""3091exceptIOError:3092print self.gitError.read()3093 sys.exit(1)30943095defimportHeadRevision(self, revision):3096print"Doing initial import of%sfrom revision%sinto%s"% (' '.join(self.depotPaths), revision, self.branch)30973098 details = {}3099 details["user"] ="git perforce import user"3100 details["desc"] = ("Initial import of%sfrom the state at revision%s\n"3101% (' '.join(self.depotPaths), revision))3102 details["change"] = revision3103 newestRevision =031043105 fileCnt =03106 fileArgs = ["%s...%s"% (p,revision)for p in self.depotPaths]31073108for info inp4CmdList(["files"] + fileArgs):31093110if'code'in info and info['code'] =='error':3111 sys.stderr.write("p4 returned an error:%s\n"3112% info['data'])3113if info['data'].find("must refer to client") >=0:3114 sys.stderr.write("This particular p4 error is misleading.\n")3115 sys.stderr.write("Perhaps the depot path was misspelled.\n");3116 sys.stderr.write("Depot path:%s\n"%" ".join(self.depotPaths))3117 sys.exit(1)3118if'p4ExitCode'in info:3119 sys.stderr.write("p4 exitcode:%s\n"% info['p4ExitCode'])3120 sys.exit(1)312131223123 change =int(info["change"])3124if change > newestRevision:3125 newestRevision = change31263127if info["action"]in self.delete_actions:3128# don't increase the file cnt, otherwise details["depotFile123"] will have gaps!3129#fileCnt = fileCnt + 13130continue31313132for prop in["depotFile","rev","action","type"]:3133 details["%s%s"% (prop, fileCnt)] = info[prop]31343135 fileCnt = fileCnt +131363137 details["change"] = newestRevision31383139# Use time from top-most change so that all git p4 clones of3140# the same p4 repo have the same commit SHA1s.3141 res =p4_describe(newestRevision)3142 details["time"] = res["time"]31433144 self.updateOptionDict(details)3145try:3146 self.commit(details, self.extractFilesFromCommit(details), self.branch)3147exceptIOError:3148print"IO error with git fast-import. Is your git version recent enough?"3149print self.gitError.read()315031513152defrun(self, args):3153 self.depotPaths = []3154 self.changeRange =""3155 self.previousDepotPaths = []3156 self.hasOrigin =False31573158# map from branch depot path to parent branch3159 self.knownBranches = {}3160 self.initialParents = {}31613162if self.importIntoRemotes:3163 self.refPrefix ="refs/remotes/p4/"3164else:3165 self.refPrefix ="refs/heads/p4/"31663167if self.syncWithOrigin:3168 self.hasOrigin =originP4BranchesExist()3169if self.hasOrigin:3170if not self.silent:3171print'Syncing with origin first, using "git fetch origin"'3172system("git fetch origin")31733174 branch_arg_given =bool(self.branch)3175iflen(self.branch) ==0:3176 self.branch = self.refPrefix +"master"3177ifgitBranchExists("refs/heads/p4")and self.importIntoRemotes:3178system("git update-ref%srefs/heads/p4"% self.branch)3179system("git branch -D p4")31803181# accept either the command-line option, or the configuration variable3182if self.useClientSpec:3183# will use this after clone to set the variable3184 self.useClientSpec_from_options =True3185else:3186ifgitConfigBool("git-p4.useclientspec"):3187 self.useClientSpec =True3188if self.useClientSpec:3189 self.clientSpecDirs =getClientSpec()31903191# TODO: should always look at previous commits,3192# merge with previous imports, if possible.3193if args == []:3194if self.hasOrigin:3195createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)31963197# branches holds mapping from branch name to sha13198 branches =p4BranchesInGit(self.importIntoRemotes)31993200# restrict to just this one, disabling detect-branches3201if branch_arg_given:3202 short = self.branch.split("/")[-1]3203if short in branches:3204 self.p4BranchesInGit = [ short ]3205else:3206 self.p4BranchesInGit = branches.keys()32073208iflen(self.p4BranchesInGit) >1:3209if not self.silent:3210print"Importing from/into multiple branches"3211 self.detectBranches =True3212for branch in branches.keys():3213 self.initialParents[self.refPrefix + branch] = \3214 branches[branch]32153216if self.verbose:3217print"branches:%s"% self.p4BranchesInGit32183219 p4Change =03220for branch in self.p4BranchesInGit:3221 logMsg =extractLogMessageFromGitCommit(self.refPrefix + branch)32223223 settings =extractSettingsGitLog(logMsg)32243225 self.readOptions(settings)3226if(settings.has_key('depot-paths')3227and settings.has_key('change')):3228 change =int(settings['change']) +13229 p4Change =max(p4Change, change)32303231 depotPaths =sorted(settings['depot-paths'])3232if self.previousDepotPaths == []:3233 self.previousDepotPaths = depotPaths3234else:3235 paths = []3236for(prev, cur)inzip(self.previousDepotPaths, depotPaths):3237 prev_list = prev.split("/")3238 cur_list = cur.split("/")3239for i inrange(0,min(len(cur_list),len(prev_list))):3240if cur_list[i] <> prev_list[i]:3241 i = i -13242break32433244 paths.append("/".join(cur_list[:i +1]))32453246 self.previousDepotPaths = paths32473248if p4Change >0:3249 self.depotPaths =sorted(self.previousDepotPaths)3250 self.changeRange ="@%s,#head"% p4Change3251if not self.silent and not self.detectBranches:3252print"Performing incremental import into%sgit branch"% self.branch32533254# accept multiple ref name abbreviations:3255# refs/foo/bar/branch -> use it exactly3256# p4/branch -> prepend refs/remotes/ or refs/heads/3257# branch -> prepend refs/remotes/p4/ or refs/heads/p4/3258if not self.branch.startswith("refs/"):3259if self.importIntoRemotes:3260 prepend ="refs/remotes/"3261else:3262 prepend ="refs/heads/"3263if not self.branch.startswith("p4/"):3264 prepend +="p4/"3265 self.branch = prepend + self.branch32663267iflen(args) ==0and self.depotPaths:3268if not self.silent:3269print"Depot paths:%s"%' '.join(self.depotPaths)3270else:3271if self.depotPaths and self.depotPaths != args:3272print("previous import used depot path%sand now%swas specified. "3273"This doesn't work!"% (' '.join(self.depotPaths),3274' '.join(args)))3275 sys.exit(1)32763277 self.depotPaths =sorted(args)32783279 revision =""3280 self.users = {}32813282# Make sure no revision specifiers are used when --changesfile3283# is specified.3284 bad_changesfile =False3285iflen(self.changesFile) >0:3286for p in self.depotPaths:3287if p.find("@") >=0or p.find("#") >=0:3288 bad_changesfile =True3289break3290if bad_changesfile:3291die("Option --changesfile is incompatible with revision specifiers")32923293 newPaths = []3294for p in self.depotPaths:3295if p.find("@") != -1:3296 atIdx = p.index("@")3297 self.changeRange = p[atIdx:]3298if self.changeRange =="@all":3299 self.changeRange =""3300elif','not in self.changeRange:3301 revision = self.changeRange3302 self.changeRange =""3303 p = p[:atIdx]3304elif p.find("#") != -1:3305 hashIdx = p.index("#")3306 revision = p[hashIdx:]3307 p = p[:hashIdx]3308elif self.previousDepotPaths == []:3309# pay attention to changesfile, if given, else import3310# the entire p4 tree at the head revision3311iflen(self.changesFile) ==0:3312 revision ="#head"33133314 p = re.sub("\.\.\.$","", p)3315if not p.endswith("/"):3316 p +="/"33173318 newPaths.append(p)33193320 self.depotPaths = newPaths33213322# --detect-branches may change this for each branch3323 self.branchPrefixes = self.depotPaths33243325 self.loadUserMapFromCache()3326 self.labels = {}3327if self.detectLabels:3328 self.getLabels();33293330if self.detectBranches:3331## FIXME - what's a P4 projectName ?3332 self.projectName = self.guessProjectName()33333334if self.hasOrigin:3335 self.getBranchMappingFromGitBranches()3336else:3337 self.getBranchMapping()3338if self.verbose:3339print"p4-git branches:%s"% self.p4BranchesInGit3340print"initial parents:%s"% self.initialParents3341for b in self.p4BranchesInGit:3342if b !="master":33433344## FIXME3345 b = b[len(self.projectName):]3346 self.createdBranches.add(b)33473348 self.tz ="%+03d%02d"% (- time.timezone /3600, ((- time.timezone %3600) /60))33493350 self.importProcess = subprocess.Popen(["git","fast-import"],3351 stdin=subprocess.PIPE,3352 stdout=subprocess.PIPE,3353 stderr=subprocess.PIPE);3354 self.gitOutput = self.importProcess.stdout3355 self.gitStream = self.importProcess.stdin3356 self.gitError = self.importProcess.stderr33573358if revision:3359 self.importHeadRevision(revision)3360else:3361 changes = []33623363iflen(self.changesFile) >0:3364 output =open(self.changesFile).readlines()3365 changeSet =set()3366for line in output:3367 changeSet.add(int(line))33683369for change in changeSet:3370 changes.append(change)33713372 changes.sort()3373else:3374# catch "git p4 sync" with no new branches, in a repo that3375# does not have any existing p4 branches3376iflen(args) ==0:3377if not self.p4BranchesInGit:3378die("No remote p4 branches. Perhaps you never did\"git p4 clone\"in here.")33793380# The default branch is master, unless --branch is used to3381# specify something else. Make sure it exists, or complain3382# nicely about how to use --branch.3383if not self.detectBranches:3384if notbranch_exists(self.branch):3385if branch_arg_given:3386die("Error: branch%sdoes not exist."% self.branch)3387else:3388die("Error: no branch%s; perhaps specify one with --branch."%3389 self.branch)33903391if self.verbose:3392print"Getting p4 changes for%s...%s"% (', '.join(self.depotPaths),3393 self.changeRange)3394 changes =p4ChangesForPaths(self.depotPaths, self.changeRange, self.changes_block_size)33953396iflen(self.maxChanges) >0:3397 changes = changes[:min(int(self.maxChanges),len(changes))]33983399iflen(changes) ==0:3400if not self.silent:3401print"No changes to import!"3402else:3403if not self.silent and not self.detectBranches:3404print"Import destination:%s"% self.branch34053406 self.updatedBranches =set()34073408if not self.detectBranches:3409if args:3410# start a new branch3411 self.initialParent =""3412else:3413# build on a previous revision3414 self.initialParent =parseRevision(self.branch)34153416 self.importChanges(changes)34173418if not self.silent:3419print""3420iflen(self.updatedBranches) >0:3421 sys.stdout.write("Updated branches: ")3422for b in self.updatedBranches:3423 sys.stdout.write("%s"% b)3424 sys.stdout.write("\n")34253426ifgitConfigBool("git-p4.importLabels"):3427 self.importLabels =True34283429if self.importLabels:3430 p4Labels =getP4Labels(self.depotPaths)3431 gitTags =getGitTags()34323433 missingP4Labels = p4Labels - gitTags3434 self.importP4Labels(self.gitStream, missingP4Labels)34353436 self.gitStream.close()3437if self.importProcess.wait() !=0:3438die("fast-import failed:%s"% self.gitError.read())3439 self.gitOutput.close()3440 self.gitError.close()34413442# Cleanup temporary branches created during import3443if self.tempBranches != []:3444for branch in self.tempBranches:3445read_pipe("git update-ref -d%s"% branch)3446 os.rmdir(os.path.join(os.environ.get("GIT_DIR",".git"), self.tempBranchLocation))34473448# Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow3449# a convenient shortcut refname "p4".3450if self.importIntoRemotes:3451 head_ref = self.refPrefix +"HEAD"3452if notgitBranchExists(head_ref)andgitBranchExists(self.branch):3453system(["git","symbolic-ref", head_ref, self.branch])34543455return True34563457classP4Rebase(Command):3458def__init__(self):3459 Command.__init__(self)3460 self.options = [3461 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),3462]3463 self.importLabels =False3464 self.description = ("Fetches the latest revision from perforce and "3465+"rebases the current work (branch) against it")34663467defrun(self, args):3468 sync =P4Sync()3469 sync.importLabels = self.importLabels3470 sync.run([])34713472return self.rebase()34733474defrebase(self):3475if os.system("git update-index --refresh") !=0:3476die("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.");3477iflen(read_pipe("git diff-index HEAD --")) >0:3478die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");34793480[upstream, settings] =findUpstreamBranchPoint()3481iflen(upstream) ==0:3482die("Cannot find upstream branchpoint for rebase")34833484# the branchpoint may be p4/foo~3, so strip off the parent3485 upstream = re.sub("~[0-9]+$","", upstream)34863487print"Rebasing the current branch onto%s"% upstream3488 oldHead =read_pipe("git rev-parse HEAD").strip()3489system("git rebase%s"% upstream)3490system("git diff-tree --stat --summary -M%sHEAD --"% oldHead)3491return True34923493classP4Clone(P4Sync):3494def__init__(self):3495 P4Sync.__init__(self)3496 self.description ="Creates a new git repository and imports from Perforce into it"3497 self.usage ="usage: %prog [options] //depot/path[@revRange]"3498 self.options += [3499 optparse.make_option("--destination", dest="cloneDestination",3500 action='store', default=None,3501help="where to leave result of the clone"),3502 optparse.make_option("--bare", dest="cloneBare",3503 action="store_true", default=False),3504]3505 self.cloneDestination =None3506 self.needsGit =False3507 self.cloneBare =False35083509defdefaultDestination(self, args):3510## TODO: use common prefix of args?3511 depotPath = args[0]3512 depotDir = re.sub("(@[^@]*)$","", depotPath)3513 depotDir = re.sub("(#[^#]*)$","", depotDir)3514 depotDir = re.sub(r"\.\.\.$","", depotDir)3515 depotDir = re.sub(r"/$","", depotDir)3516return os.path.split(depotDir)[1]35173518defrun(self, args):3519iflen(args) <1:3520return False35213522if self.keepRepoPath and not self.cloneDestination:3523 sys.stderr.write("Must specify destination for --keep-path\n")3524 sys.exit(1)35253526 depotPaths = args35273528if not self.cloneDestination andlen(depotPaths) >1:3529 self.cloneDestination = depotPaths[-1]3530 depotPaths = depotPaths[:-1]35313532 self.cloneExclude = ["/"+p for p in self.cloneExclude]3533for p in depotPaths:3534if not p.startswith("//"):3535 sys.stderr.write('Depot paths must start with "//":%s\n'% p)3536return False35373538if not self.cloneDestination:3539 self.cloneDestination = self.defaultDestination(args)35403541print"Importing from%sinto%s"% (', '.join(depotPaths), self.cloneDestination)35423543if not os.path.exists(self.cloneDestination):3544 os.makedirs(self.cloneDestination)3545chdir(self.cloneDestination)35463547 init_cmd = ["git","init"]3548if self.cloneBare:3549 init_cmd.append("--bare")3550 retcode = subprocess.call(init_cmd)3551if retcode:3552raiseCalledProcessError(retcode, init_cmd)35533554if not P4Sync.run(self, depotPaths):3555return False35563557# create a master branch and check out a work tree3558ifgitBranchExists(self.branch):3559system(["git","branch","master", self.branch ])3560if not self.cloneBare:3561system(["git","checkout","-f"])3562else:3563print'Not checking out any branch, use ' \3564'"git checkout -q -b master <branch>"'35653566# auto-set this variable if invoked with --use-client-spec3567if self.useClientSpec_from_options:3568system("git config --bool git-p4.useclientspec true")35693570return True35713572classP4Branches(Command):3573def__init__(self):3574 Command.__init__(self)3575 self.options = [ ]3576 self.description = ("Shows the git branches that hold imports and their "3577+"corresponding perforce depot paths")3578 self.verbose =False35793580defrun(self, args):3581iforiginP4BranchesExist():3582createOrUpdateBranchesFromOrigin()35833584 cmdline ="git rev-parse --symbolic "3585 cmdline +=" --remotes"35863587for line inread_pipe_lines(cmdline):3588 line = line.strip()35893590if not line.startswith('p4/')or line =="p4/HEAD":3591continue3592 branch = line35933594 log =extractLogMessageFromGitCommit("refs/remotes/%s"% branch)3595 settings =extractSettingsGitLog(log)35963597print"%s<=%s(%s)"% (branch,",".join(settings["depot-paths"]), settings["change"])3598return True35993600classHelpFormatter(optparse.IndentedHelpFormatter):3601def__init__(self):3602 optparse.IndentedHelpFormatter.__init__(self)36033604defformat_description(self, description):3605if description:3606return description +"\n"3607else:3608return""36093610defprintUsage(commands):3611print"usage:%s<command> [options]"% sys.argv[0]3612print""3613print"valid commands:%s"%", ".join(commands)3614print""3615print"Try%s<command> --help for command specific help."% sys.argv[0]3616print""36173618commands = {3619"debug": P4Debug,3620"submit": P4Submit,3621"commit": P4Submit,3622"sync": P4Sync,3623"rebase": P4Rebase,3624"clone": P4Clone,3625"rollback": P4RollBack,3626"branches": P4Branches3627}362836293630defmain():3631iflen(sys.argv[1:]) ==0:3632printUsage(commands.keys())3633 sys.exit(2)36343635 cmdName = sys.argv[1]3636try:3637 klass = commands[cmdName]3638 cmd =klass()3639exceptKeyError:3640print"unknown command%s"% cmdName3641print""3642printUsage(commands.keys())3643 sys.exit(2)36443645 options = cmd.options3646 cmd.gitdir = os.environ.get("GIT_DIR",None)36473648 args = sys.argv[2:]36493650 options.append(optparse.make_option("--verbose","-v", dest="verbose", action="store_true"))3651if cmd.needsGit:3652 options.append(optparse.make_option("--git-dir", dest="gitdir"))36533654 parser = optparse.OptionParser(cmd.usage.replace("%prog","%prog "+ cmdName),3655 options,3656 description = cmd.description,3657 formatter =HelpFormatter())36583659(cmd, args) = parser.parse_args(sys.argv[2:], cmd);3660global verbose3661 verbose = cmd.verbose3662if cmd.needsGit:3663if cmd.gitdir ==None:3664 cmd.gitdir = os.path.abspath(".git")3665if notisValidGitDir(cmd.gitdir):3666 cmd.gitdir =read_pipe("git rev-parse --git-dir").strip()3667if os.path.exists(cmd.gitdir):3668 cdup =read_pipe("git rev-parse --show-cdup").strip()3669iflen(cdup) >0:3670chdir(cdup);36713672if notisValidGitDir(cmd.gitdir):3673ifisValidGitDir(cmd.gitdir +"/.git"):3674 cmd.gitdir +="/.git"3675else:3676die("fatal: cannot locate git repository at%s"% cmd.gitdir)36773678 os.environ["GIT_DIR"] = cmd.gitdir36793680if not cmd.run(args):3681 parser.print_help()3682 sys.exit(2)368336843685if __name__ =='__main__':3686main()