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# 10 11import optparse, sys, os, marshal, subprocess, shelve 12import tempfile, getopt, os.path, time, platform 13import re 14 15verbose =False 16 17 18defp4_build_cmd(cmd): 19"""Build a suitable p4 command line. 20 21 This consolidates building and returning a p4 command line into one 22 location. It means that hooking into the environment, or other configuration 23 can be done more easily. 24 """ 25 real_cmd = ["p4"] 26 27 user =gitConfig("git-p4.user") 28iflen(user) >0: 29 real_cmd += ["-u",user] 30 31 password =gitConfig("git-p4.password") 32iflen(password) >0: 33 real_cmd += ["-P", password] 34 35 port =gitConfig("git-p4.port") 36iflen(port) >0: 37 real_cmd += ["-p", port] 38 39 host =gitConfig("git-p4.host") 40iflen(host) >0: 41 real_cmd += ["-h", host] 42 43 client =gitConfig("git-p4.client") 44iflen(client) >0: 45 real_cmd += ["-c", client] 46 47 48ifisinstance(cmd,basestring): 49 real_cmd =' '.join(real_cmd) +' '+ cmd 50else: 51 real_cmd += cmd 52return real_cmd 53 54defchdir(dir): 55# P4 uses the PWD environment variable rather than getcwd(). Since we're 56# not using the shell, we have to set it ourselves. This path could 57# be relative, so go there first, then figure out where we ended up. 58 os.chdir(dir) 59 os.environ['PWD'] = os.getcwd() 60 61defdie(msg): 62if verbose: 63raiseException(msg) 64else: 65 sys.stderr.write(msg +"\n") 66 sys.exit(1) 67 68defwrite_pipe(c, stdin): 69if verbose: 70 sys.stderr.write('Writing pipe:%s\n'%str(c)) 71 72 expand =isinstance(c,basestring) 73 p = subprocess.Popen(c, stdin=subprocess.PIPE, shell=expand) 74 pipe = p.stdin 75 val = pipe.write(stdin) 76 pipe.close() 77if p.wait(): 78die('Command failed:%s'%str(c)) 79 80return val 81 82defp4_write_pipe(c, stdin): 83 real_cmd =p4_build_cmd(c) 84returnwrite_pipe(real_cmd, stdin) 85 86defread_pipe(c, ignore_error=False): 87if verbose: 88 sys.stderr.write('Reading pipe:%s\n'%str(c)) 89 90 expand =isinstance(c,basestring) 91 p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand) 92 pipe = p.stdout 93 val = pipe.read() 94if p.wait()and not ignore_error: 95die('Command failed:%s'%str(c)) 96 97return val 98 99defp4_read_pipe(c, ignore_error=False): 100 real_cmd =p4_build_cmd(c) 101returnread_pipe(real_cmd, ignore_error) 102 103defread_pipe_lines(c): 104if verbose: 105 sys.stderr.write('Reading pipe:%s\n'%str(c)) 106 107 expand =isinstance(c, basestring) 108 p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand) 109 pipe = p.stdout 110 val = pipe.readlines() 111if pipe.close()or p.wait(): 112die('Command failed:%s'%str(c)) 113 114return val 115 116defp4_read_pipe_lines(c): 117"""Specifically invoke p4 on the command supplied. """ 118 real_cmd =p4_build_cmd(c) 119returnread_pipe_lines(real_cmd) 120 121defsystem(cmd): 122 expand =isinstance(cmd,basestring) 123if verbose: 124 sys.stderr.write("executing%s\n"%str(cmd)) 125 subprocess.check_call(cmd, shell=expand) 126 127defp4_system(cmd): 128"""Specifically invoke p4 as the system command. """ 129 real_cmd =p4_build_cmd(cmd) 130 expand =isinstance(real_cmd, basestring) 131 subprocess.check_call(real_cmd, shell=expand) 132 133defp4_integrate(src, dest): 134p4_system(["integrate","-Dt", src, dest]) 135 136defp4_sync(path): 137p4_system(["sync", path]) 138 139defp4_add(f): 140p4_system(["add", f]) 141 142defp4_delete(f): 143p4_system(["delete", f]) 144 145defp4_edit(f): 146p4_system(["edit", f]) 147 148defp4_revert(f): 149p4_system(["revert", f]) 150 151defp4_reopen(type,file): 152p4_system(["reopen","-t",type,file]) 153 154# 155# Canonicalize the p4 type and return a tuple of the 156# base type, plus any modifiers. See "p4 help filetypes" 157# for a list and explanation. 158# 159defsplit_p4_type(p4type): 160 161 p4_filetypes_historical = { 162"ctempobj":"binary+Sw", 163"ctext":"text+C", 164"cxtext":"text+Cx", 165"ktext":"text+k", 166"kxtext":"text+kx", 167"ltext":"text+F", 168"tempobj":"binary+FSw", 169"ubinary":"binary+F", 170"uresource":"resource+F", 171"uxbinary":"binary+Fx", 172"xbinary":"binary+x", 173"xltext":"text+Fx", 174"xtempobj":"binary+Swx", 175"xtext":"text+x", 176"xunicode":"unicode+x", 177"xutf16":"utf16+x", 178} 179if p4type in p4_filetypes_historical: 180 p4type = p4_filetypes_historical[p4type] 181 mods ="" 182 s = p4type.split("+") 183 base = s[0] 184 mods ="" 185iflen(s) >1: 186 mods = s[1] 187return(base, mods) 188 189 190defsetP4ExecBit(file, mode): 191# Reopens an already open file and changes the execute bit to match 192# the execute bit setting in the passed in mode. 193 194 p4Type ="+x" 195 196if notisModeExec(mode): 197 p4Type =getP4OpenedType(file) 198 p4Type = re.sub('^([cku]?)x(.*)','\\1\\2', p4Type) 199 p4Type = re.sub('(.*?\+.*?)x(.*?)','\\1\\2', p4Type) 200if p4Type[-1] =="+": 201 p4Type = p4Type[0:-1] 202 203p4_reopen(p4Type,file) 204 205defgetP4OpenedType(file): 206# Returns the perforce file type for the given file. 207 208 result =p4_read_pipe(["opened",file]) 209 match = re.match(".*\((.+)\)\r?$", result) 210if match: 211return match.group(1) 212else: 213die("Could not determine file type for%s(result: '%s')"% (file, result)) 214 215defdiffTreePattern(): 216# This is a simple generator for the diff tree regex pattern. This could be 217# a class variable if this and parseDiffTreeEntry were a part of a class. 218 pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)') 219while True: 220yield pattern 221 222defparseDiffTreeEntry(entry): 223"""Parses a single diff tree entry into its component elements. 224 225 See git-diff-tree(1) manpage for details about the format of the diff 226 output. This method returns a dictionary with the following elements: 227 228 src_mode - The mode of the source file 229 dst_mode - The mode of the destination file 230 src_sha1 - The sha1 for the source file 231 dst_sha1 - The sha1 fr the destination file 232 status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc) 233 status_score - The score for the status (applicable for 'C' and 'R' 234 statuses). This is None if there is no score. 235 src - The path for the source file. 236 dst - The path for the destination file. This is only present for 237 copy or renames. If it is not present, this is None. 238 239 If the pattern is not matched, None is returned.""" 240 241 match =diffTreePattern().next().match(entry) 242if match: 243return{ 244'src_mode': match.group(1), 245'dst_mode': match.group(2), 246'src_sha1': match.group(3), 247'dst_sha1': match.group(4), 248'status': match.group(5), 249'status_score': match.group(6), 250'src': match.group(7), 251'dst': match.group(10) 252} 253return None 254 255defisModeExec(mode): 256# Returns True if the given git mode represents an executable file, 257# otherwise False. 258return mode[-3:] =="755" 259 260defisModeExecChanged(src_mode, dst_mode): 261returnisModeExec(src_mode) !=isModeExec(dst_mode) 262 263defp4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None): 264 265ifisinstance(cmd,basestring): 266 cmd ="-G "+ cmd 267 expand =True 268else: 269 cmd = ["-G"] + cmd 270 expand =False 271 272 cmd =p4_build_cmd(cmd) 273if verbose: 274 sys.stderr.write("Opening pipe:%s\n"%str(cmd)) 275 276# Use a temporary file to avoid deadlocks without 277# subprocess.communicate(), which would put another copy 278# of stdout into memory. 279 stdin_file =None 280if stdin is not None: 281 stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode) 282ifisinstance(stdin,basestring): 283 stdin_file.write(stdin) 284else: 285for i in stdin: 286 stdin_file.write(i +'\n') 287 stdin_file.flush() 288 stdin_file.seek(0) 289 290 p4 = subprocess.Popen(cmd, 291 shell=expand, 292 stdin=stdin_file, 293 stdout=subprocess.PIPE) 294 295 result = [] 296try: 297while True: 298 entry = marshal.load(p4.stdout) 299if cb is not None: 300cb(entry) 301else: 302 result.append(entry) 303exceptEOFError: 304pass 305 exitCode = p4.wait() 306if exitCode !=0: 307 entry = {} 308 entry["p4ExitCode"] = exitCode 309 result.append(entry) 310 311return result 312 313defp4Cmd(cmd): 314list=p4CmdList(cmd) 315 result = {} 316for entry inlist: 317 result.update(entry) 318return result; 319 320defp4Where(depotPath): 321if not depotPath.endswith("/"): 322 depotPath +="/" 323 depotPath = depotPath +"..." 324 outputList =p4CmdList(["where", depotPath]) 325 output =None 326for entry in outputList: 327if"depotFile"in entry: 328if entry["depotFile"] == depotPath: 329 output = entry 330break 331elif"data"in entry: 332 data = entry.get("data") 333 space = data.find(" ") 334if data[:space] == depotPath: 335 output = entry 336break 337if output ==None: 338return"" 339if output["code"] =="error": 340return"" 341 clientPath ="" 342if"path"in output: 343 clientPath = output.get("path") 344elif"data"in output: 345 data = output.get("data") 346 lastSpace = data.rfind(" ") 347 clientPath = data[lastSpace +1:] 348 349if clientPath.endswith("..."): 350 clientPath = clientPath[:-3] 351return clientPath 352 353defcurrentGitBranch(): 354returnread_pipe("git name-rev HEAD").split(" ")[1].strip() 355 356defisValidGitDir(path): 357if(os.path.exists(path +"/HEAD") 358and os.path.exists(path +"/refs")and os.path.exists(path +"/objects")): 359return True; 360return False 361 362defparseRevision(ref): 363returnread_pipe("git rev-parse%s"% ref).strip() 364 365defbranchExists(ref): 366 rev =read_pipe(["git","rev-parse","-q","--verify", ref], 367 ignore_error=True) 368returnlen(rev) >0 369 370defextractLogMessageFromGitCommit(commit): 371 logMessage ="" 372 373## fixme: title is first line of commit, not 1st paragraph. 374 foundTitle =False 375for log inread_pipe_lines("git cat-file commit%s"% commit): 376if not foundTitle: 377iflen(log) ==1: 378 foundTitle =True 379continue 380 381 logMessage += log 382return logMessage 383 384defextractSettingsGitLog(log): 385 values = {} 386for line in log.split("\n"): 387 line = line.strip() 388 m = re.search(r"^ *\[git-p4: (.*)\]$", line) 389if not m: 390continue 391 392 assignments = m.group(1).split(':') 393for a in assignments: 394 vals = a.split('=') 395 key = vals[0].strip() 396 val = ('='.join(vals[1:])).strip() 397if val.endswith('\"')and val.startswith('"'): 398 val = val[1:-1] 399 400 values[key] = val 401 402 paths = values.get("depot-paths") 403if not paths: 404 paths = values.get("depot-path") 405if paths: 406 values['depot-paths'] = paths.split(',') 407return values 408 409defgitBranchExists(branch): 410 proc = subprocess.Popen(["git","rev-parse", branch], 411 stderr=subprocess.PIPE, stdout=subprocess.PIPE); 412return proc.wait() ==0; 413 414_gitConfig = {} 415defgitConfig(key, args =None):# set args to "--bool", for instance 416if not _gitConfig.has_key(key): 417 argsFilter ="" 418if args !=None: 419 argsFilter ="%s"% args 420 cmd ="git config%s%s"% (argsFilter, key) 421 _gitConfig[key] =read_pipe(cmd, ignore_error=True).strip() 422return _gitConfig[key] 423 424defgitConfigList(key): 425if not _gitConfig.has_key(key): 426 _gitConfig[key] =read_pipe("git config --get-all%s"% key, ignore_error=True).strip().split(os.linesep) 427return _gitConfig[key] 428 429defp4BranchesInGit(branchesAreInRemotes =True): 430 branches = {} 431 432 cmdline ="git rev-parse --symbolic " 433if branchesAreInRemotes: 434 cmdline +=" --remotes" 435else: 436 cmdline +=" --branches" 437 438for line inread_pipe_lines(cmdline): 439 line = line.strip() 440 441## only import to p4/ 442if not line.startswith('p4/')or line =="p4/HEAD": 443continue 444 branch = line 445 446# strip off p4 447 branch = re.sub("^p4/","", line) 448 449 branches[branch] =parseRevision(line) 450return branches 451 452deffindUpstreamBranchPoint(head ="HEAD"): 453 branches =p4BranchesInGit() 454# map from depot-path to branch name 455 branchByDepotPath = {} 456for branch in branches.keys(): 457 tip = branches[branch] 458 log =extractLogMessageFromGitCommit(tip) 459 settings =extractSettingsGitLog(log) 460if settings.has_key("depot-paths"): 461 paths =",".join(settings["depot-paths"]) 462 branchByDepotPath[paths] ="remotes/p4/"+ branch 463 464 settings =None 465 parent =0 466while parent <65535: 467 commit = head +"~%s"% parent 468 log =extractLogMessageFromGitCommit(commit) 469 settings =extractSettingsGitLog(log) 470if settings.has_key("depot-paths"): 471 paths =",".join(settings["depot-paths"]) 472if branchByDepotPath.has_key(paths): 473return[branchByDepotPath[paths], settings] 474 475 parent = parent +1 476 477return["", settings] 478 479defcreateOrUpdateBranchesFromOrigin(localRefPrefix ="refs/remotes/p4/", silent=True): 480if not silent: 481print("Creating/updating branch(es) in%sbased on origin branch(es)" 482% localRefPrefix) 483 484 originPrefix ="origin/p4/" 485 486for line inread_pipe_lines("git rev-parse --symbolic --remotes"): 487 line = line.strip() 488if(not line.startswith(originPrefix))or line.endswith("HEAD"): 489continue 490 491 headName = line[len(originPrefix):] 492 remoteHead = localRefPrefix + headName 493 originHead = line 494 495 original =extractSettingsGitLog(extractLogMessageFromGitCommit(originHead)) 496if(not original.has_key('depot-paths') 497or not original.has_key('change')): 498continue 499 500 update =False 501if notgitBranchExists(remoteHead): 502if verbose: 503print"creating%s"% remoteHead 504 update =True 505else: 506 settings =extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead)) 507if settings.has_key('change') >0: 508if settings['depot-paths'] == original['depot-paths']: 509 originP4Change =int(original['change']) 510 p4Change =int(settings['change']) 511if originP4Change > p4Change: 512print("%s(%s) is newer than%s(%s). " 513"Updating p4 branch from origin." 514% (originHead, originP4Change, 515 remoteHead, p4Change)) 516 update =True 517else: 518print("Ignoring:%swas imported from%swhile " 519"%swas imported from%s" 520% (originHead,','.join(original['depot-paths']), 521 remoteHead,','.join(settings['depot-paths']))) 522 523if update: 524system("git update-ref%s %s"% (remoteHead, originHead)) 525 526deforiginP4BranchesExist(): 527returngitBranchExists("origin")orgitBranchExists("origin/p4")orgitBranchExists("origin/p4/master") 528 529defp4ChangesForPaths(depotPaths, changeRange): 530assert depotPaths 531 cmd = ['changes'] 532for p in depotPaths: 533 cmd += ["%s...%s"% (p, changeRange)] 534 output =p4_read_pipe_lines(cmd) 535 536 changes = {} 537for line in output: 538 changeNum =int(line.split(" ")[1]) 539 changes[changeNum] =True 540 541 changelist = changes.keys() 542 changelist.sort() 543return changelist 544 545defp4PathStartsWith(path, prefix): 546# This method tries to remedy a potential mixed-case issue: 547# 548# If UserA adds //depot/DirA/file1 549# and UserB adds //depot/dira/file2 550# 551# we may or may not have a problem. If you have core.ignorecase=true, 552# we treat DirA and dira as the same directory 553 ignorecase =gitConfig("core.ignorecase","--bool") =="true" 554if ignorecase: 555return path.lower().startswith(prefix.lower()) 556return path.startswith(prefix) 557 558class Command: 559def__init__(self): 560 self.usage ="usage: %prog [options]" 561 self.needsGit =True 562 563class P4UserMap: 564def__init__(self): 565 self.userMapFromPerforceServer =False 566 self.myP4UserId =None 567 568defp4UserId(self): 569if self.myP4UserId: 570return self.myP4UserId 571 572 results =p4CmdList("user -o") 573for r in results: 574if r.has_key('User'): 575 self.myP4UserId = r['User'] 576return r['User'] 577die("Could not find your p4 user id") 578 579defp4UserIsMe(self, p4User): 580# return True if the given p4 user is actually me 581 me = self.p4UserId() 582if not p4User or p4User != me: 583return False 584else: 585return True 586 587defgetUserCacheFilename(self): 588 home = os.environ.get("HOME", os.environ.get("USERPROFILE")) 589return home +"/.gitp4-usercache.txt" 590 591defgetUserMapFromPerforceServer(self): 592if self.userMapFromPerforceServer: 593return 594 self.users = {} 595 self.emails = {} 596 597for output inp4CmdList("users"): 598if not output.has_key("User"): 599continue 600 self.users[output["User"]] = output["FullName"] +" <"+ output["Email"] +">" 601 self.emails[output["Email"]] = output["User"] 602 603 604 s ='' 605for(key, val)in self.users.items(): 606 s +="%s\t%s\n"% (key.expandtabs(1), val.expandtabs(1)) 607 608open(self.getUserCacheFilename(),"wb").write(s) 609 self.userMapFromPerforceServer =True 610 611defloadUserMapFromCache(self): 612 self.users = {} 613 self.userMapFromPerforceServer =False 614try: 615 cache =open(self.getUserCacheFilename(),"rb") 616 lines = cache.readlines() 617 cache.close() 618for line in lines: 619 entry = line.strip().split("\t") 620 self.users[entry[0]] = entry[1] 621exceptIOError: 622 self.getUserMapFromPerforceServer() 623 624classP4Debug(Command): 625def__init__(self): 626 Command.__init__(self) 627 self.options = [ 628 optparse.make_option("--verbose", dest="verbose", action="store_true", 629 default=False), 630] 631 self.description ="A tool to debug the output of p4 -G." 632 self.needsGit =False 633 self.verbose =False 634 635defrun(self, args): 636 j =0 637for output inp4CmdList(args): 638print'Element:%d'% j 639 j +=1 640print output 641return True 642 643classP4RollBack(Command): 644def__init__(self): 645 Command.__init__(self) 646 self.options = [ 647 optparse.make_option("--verbose", dest="verbose", action="store_true"), 648 optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true") 649] 650 self.description ="A tool to debug the multi-branch import. Don't use :)" 651 self.verbose =False 652 self.rollbackLocalBranches =False 653 654defrun(self, args): 655iflen(args) !=1: 656return False 657 maxChange =int(args[0]) 658 659if"p4ExitCode"inp4Cmd("changes -m 1"): 660die("Problems executing p4"); 661 662if self.rollbackLocalBranches: 663 refPrefix ="refs/heads/" 664 lines =read_pipe_lines("git rev-parse --symbolic --branches") 665else: 666 refPrefix ="refs/remotes/" 667 lines =read_pipe_lines("git rev-parse --symbolic --remotes") 668 669for line in lines: 670if self.rollbackLocalBranches or(line.startswith("p4/")and line !="p4/HEAD\n"): 671 line = line.strip() 672 ref = refPrefix + line 673 log =extractLogMessageFromGitCommit(ref) 674 settings =extractSettingsGitLog(log) 675 676 depotPaths = settings['depot-paths'] 677 change = settings['change'] 678 679 changed =False 680 681iflen(p4Cmd("changes -m 1 "+' '.join(['%s...@%s'% (p, maxChange) 682for p in depotPaths]))) ==0: 683print"Branch%sdid not exist at change%s, deleting."% (ref, maxChange) 684system("git update-ref -d%s`git rev-parse%s`"% (ref, ref)) 685continue 686 687while change andint(change) > maxChange: 688 changed =True 689if self.verbose: 690print"%sis at%s; rewinding towards%s"% (ref, change, maxChange) 691system("git update-ref%s\"%s^\""% (ref, ref)) 692 log =extractLogMessageFromGitCommit(ref) 693 settings =extractSettingsGitLog(log) 694 695 696 depotPaths = settings['depot-paths'] 697 change = settings['change'] 698 699if changed: 700print"%srewound to%s"% (ref, change) 701 702return True 703 704classP4Submit(Command, P4UserMap): 705def__init__(self): 706 Command.__init__(self) 707 P4UserMap.__init__(self) 708 self.options = [ 709 optparse.make_option("--verbose", dest="verbose", action="store_true"), 710 optparse.make_option("--origin", dest="origin"), 711 optparse.make_option("-M", dest="detectRenames", action="store_true"), 712# preserve the user, requires relevant p4 permissions 713 optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"), 714] 715 self.description ="Submit changes from git to the perforce depot." 716 self.usage +=" [name of git branch to submit into perforce depot]" 717 self.interactive =True 718 self.origin ="" 719 self.detectRenames =False 720 self.verbose =False 721 self.preserveUser =gitConfig("git-p4.preserveUser").lower() =="true" 722 self.isWindows = (platform.system() =="Windows") 723 724defcheck(self): 725iflen(p4CmdList("opened ...")) >0: 726die("You have files opened with perforce! Close them before starting the sync.") 727 728# replaces everything between 'Description:' and the next P4 submit template field with the 729# commit message 730defprepareLogMessage(self, template, message): 731 result ="" 732 733 inDescriptionSection =False 734 735for line in template.split("\n"): 736if line.startswith("#"): 737 result += line +"\n" 738continue 739 740if inDescriptionSection: 741if line.startswith("Files:")or line.startswith("Jobs:"): 742 inDescriptionSection =False 743else: 744continue 745else: 746if line.startswith("Description:"): 747 inDescriptionSection =True 748 line +="\n" 749for messageLine in message.split("\n"): 750 line +="\t"+ messageLine +"\n" 751 752 result += line +"\n" 753 754return result 755 756defp4UserForCommit(self,id): 757# Return the tuple (perforce user,git email) for a given git commit id 758 self.getUserMapFromPerforceServer() 759 gitEmail =read_pipe("git log --max-count=1 --format='%%ae'%s"%id) 760 gitEmail = gitEmail.strip() 761if not self.emails.has_key(gitEmail): 762return(None,gitEmail) 763else: 764return(self.emails[gitEmail],gitEmail) 765 766defcheckValidP4Users(self,commits): 767# check if any git authors cannot be mapped to p4 users 768foridin commits: 769(user,email) = self.p4UserForCommit(id) 770if not user: 771 msg ="Cannot find p4 user for email%sin commit%s."% (email,id) 772ifgitConfig('git-p4.allowMissingP4Users').lower() =="true": 773print"%s"% msg 774else: 775die("Error:%s\nSet git-p4.allowMissingP4Users to true to allow this."% msg) 776 777deflastP4Changelist(self): 778# Get back the last changelist number submitted in this client spec. This 779# then gets used to patch up the username in the change. If the same 780# client spec is being used by multiple processes then this might go 781# wrong. 782 results =p4CmdList("client -o")# find the current client 783 client =None 784for r in results: 785if r.has_key('Client'): 786 client = r['Client'] 787break 788if not client: 789die("could not get client spec") 790 results =p4CmdList(["changes","-c", client,"-m","1"]) 791for r in results: 792if r.has_key('change'): 793return r['change'] 794die("Could not get changelist number for last submit - cannot patch up user details") 795 796defmodifyChangelistUser(self, changelist, newUser): 797# fixup the user field of a changelist after it has been submitted. 798 changes =p4CmdList("change -o%s"% changelist) 799iflen(changes) !=1: 800die("Bad output from p4 change modifying%sto user%s"% 801(changelist, newUser)) 802 803 c = changes[0] 804if c['User'] == newUser:return# nothing to do 805 c['User'] = newUser 806input= marshal.dumps(c) 807 808 result =p4CmdList("change -f -i", stdin=input) 809for r in result: 810if r.has_key('code'): 811if r['code'] =='error': 812die("Could not modify user field of changelist%sto%s:%s"% (changelist, newUser, r['data'])) 813if r.has_key('data'): 814print("Updated user field for changelist%sto%s"% (changelist, newUser)) 815return 816die("Could not modify user field of changelist%sto%s"% (changelist, newUser)) 817 818defcanChangeChangelists(self): 819# check to see if we have p4 admin or super-user permissions, either of 820# which are required to modify changelists. 821 results =p4CmdList(["protects", self.depotPath]) 822for r in results: 823if r.has_key('perm'): 824if r['perm'] =='admin': 825return1 826if r['perm'] =='super': 827return1 828return0 829 830defprepareSubmitTemplate(self): 831# remove lines in the Files section that show changes to files outside the depot path we're committing into 832 template ="" 833 inFilesSection =False 834for line inp4_read_pipe_lines(['change','-o']): 835if line.endswith("\r\n"): 836 line = line[:-2] +"\n" 837if inFilesSection: 838if line.startswith("\t"): 839# path starts and ends with a tab 840 path = line[1:] 841 lastTab = path.rfind("\t") 842if lastTab != -1: 843 path = path[:lastTab] 844if notp4PathStartsWith(path, self.depotPath): 845continue 846else: 847 inFilesSection =False 848else: 849if line.startswith("Files:"): 850 inFilesSection =True 851 852 template += line 853 854return template 855 856defedit_template(self, template_file): 857"""Invoke the editor to let the user change the submission 858 message. Return true if okay to continue with the submit.""" 859 860# if configured to skip the editing part, just submit 861ifgitConfig("git-p4.skipSubmitEdit") =="true": 862return True 863 864# look at the modification time, to check later if the user saved 865# the file 866 mtime = os.stat(template_file).st_mtime 867 868# invoke the editor 869if os.environ.has_key("P4EDITOR"): 870 editor = os.environ.get("P4EDITOR") 871else: 872 editor =read_pipe("git var GIT_EDITOR").strip() 873system(editor +" "+ template_file) 874 875# If the file was not saved, prompt to see if this patch should 876# be skipped. But skip this verification step if configured so. 877ifgitConfig("git-p4.skipSubmitEditCheck") =="true": 878return True 879 880# modification time updated means user saved the file 881if os.stat(template_file).st_mtime > mtime: 882return True 883 884while True: 885 response =raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ") 886if response =='y': 887return True 888if response =='n': 889return False 890 891defapplyCommit(self,id): 892print"Applying%s"% (read_pipe("git log --max-count=1 --pretty=oneline%s"%id)) 893 894(p4User, gitEmail) = self.p4UserForCommit(id) 895 896if not self.detectRenames: 897# If not explicitly set check the config variable 898 self.detectRenames =gitConfig("git-p4.detectRenames") 899 900if self.detectRenames.lower() =="false"or self.detectRenames =="": 901 diffOpts ="" 902elif self.detectRenames.lower() =="true": 903 diffOpts ="-M" 904else: 905 diffOpts ="-M%s"% self.detectRenames 906 907 detectCopies =gitConfig("git-p4.detectCopies") 908if detectCopies.lower() =="true": 909 diffOpts +=" -C" 910elif detectCopies !=""and detectCopies.lower() !="false": 911 diffOpts +=" -C%s"% detectCopies 912 913ifgitConfig("git-p4.detectCopiesHarder","--bool") =="true": 914 diffOpts +=" --find-copies-harder" 915 916 diff =read_pipe_lines("git diff-tree -r%s\"%s^\" \"%s\""% (diffOpts,id,id)) 917 filesToAdd =set() 918 filesToDelete =set() 919 editedFiles =set() 920 filesToChangeExecBit = {} 921for line in diff: 922 diff =parseDiffTreeEntry(line) 923 modifier = diff['status'] 924 path = diff['src'] 925if modifier =="M": 926p4_edit(path) 927ifisModeExecChanged(diff['src_mode'], diff['dst_mode']): 928 filesToChangeExecBit[path] = diff['dst_mode'] 929 editedFiles.add(path) 930elif modifier =="A": 931 filesToAdd.add(path) 932 filesToChangeExecBit[path] = diff['dst_mode'] 933if path in filesToDelete: 934 filesToDelete.remove(path) 935elif modifier =="D": 936 filesToDelete.add(path) 937if path in filesToAdd: 938 filesToAdd.remove(path) 939elif modifier =="C": 940 src, dest = diff['src'], diff['dst'] 941p4_integrate(src, dest) 942if diff['src_sha1'] != diff['dst_sha1']: 943p4_edit(dest) 944ifisModeExecChanged(diff['src_mode'], diff['dst_mode']): 945p4_edit(dest) 946 filesToChangeExecBit[dest] = diff['dst_mode'] 947 os.unlink(dest) 948 editedFiles.add(dest) 949elif modifier =="R": 950 src, dest = diff['src'], diff['dst'] 951p4_integrate(src, dest) 952if diff['src_sha1'] != diff['dst_sha1']: 953p4_edit(dest) 954ifisModeExecChanged(diff['src_mode'], diff['dst_mode']): 955p4_edit(dest) 956 filesToChangeExecBit[dest] = diff['dst_mode'] 957 os.unlink(dest) 958 editedFiles.add(dest) 959 filesToDelete.add(src) 960else: 961die("unknown modifier%sfor%s"% (modifier, path)) 962 963 diffcmd ="git format-patch -k --stdout\"%s^\"..\"%s\""% (id,id) 964 patchcmd = diffcmd +" | git apply " 965 tryPatchCmd = patchcmd +"--check -" 966 applyPatchCmd = patchcmd +"--check --apply -" 967 968if os.system(tryPatchCmd) !=0: 969print"Unfortunately applying the change failed!" 970print"What do you want to do?" 971 response ="x" 972while response !="s"and response !="a"and response !="w": 973 response =raw_input("[s]kip this patch / [a]pply the patch forcibly " 974"and with .rej files / [w]rite the patch to a file (patch.txt) ") 975if response =="s": 976print"Skipping! Good luck with the next patches..." 977for f in editedFiles: 978p4_revert(f) 979for f in filesToAdd: 980 os.remove(f) 981return 982elif response =="a": 983 os.system(applyPatchCmd) 984iflen(filesToAdd) >0: 985print"You may also want to call p4 add on the following files:" 986print" ".join(filesToAdd) 987iflen(filesToDelete): 988print"The following files should be scheduled for deletion with p4 delete:" 989print" ".join(filesToDelete) 990die("Please resolve and submit the conflict manually and " 991+"continue afterwards with git-p4 submit --continue") 992elif response =="w": 993system(diffcmd +" > patch.txt") 994print"Patch saved to patch.txt in%s!"% self.clientPath 995die("Please resolve and submit the conflict manually and " 996"continue afterwards with git-p4 submit --continue") 997 998system(applyPatchCmd) 9991000for f in filesToAdd:1001p4_add(f)1002for f in filesToDelete:1003p4_revert(f)1004p4_delete(f)10051006# Set/clear executable bits1007for f in filesToChangeExecBit.keys():1008 mode = filesToChangeExecBit[f]1009setP4ExecBit(f, mode)10101011 logMessage =extractLogMessageFromGitCommit(id)1012 logMessage = logMessage.strip()10131014 template = self.prepareSubmitTemplate()10151016if self.interactive:1017 submitTemplate = self.prepareLogMessage(template, logMessage)10181019if self.preserveUser:1020 submitTemplate = submitTemplate + ("\n######## Actual user%s, modified after commit\n"% p4User)10211022if os.environ.has_key("P4DIFF"):1023del(os.environ["P4DIFF"])1024 diff =""1025for editedFile in editedFiles:1026 diff +=p4_read_pipe(['diff','-du', editedFile])10271028 newdiff =""1029for newFile in filesToAdd:1030 newdiff +="==== new file ====\n"1031 newdiff +="--- /dev/null\n"1032 newdiff +="+++%s\n"% newFile1033 f =open(newFile,"r")1034for line in f.readlines():1035 newdiff +="+"+ line1036 f.close()10371038if self.checkAuthorship and not self.p4UserIsMe(p4User):1039 submitTemplate +="######## git author%sdoes not match your p4 account.\n"% gitEmail1040 submitTemplate +="######## Use git-p4 option --preserve-user to modify authorship\n"1041 submitTemplate +="######## Use git-p4 config git-p4.skipUserNameCheck hides this message.\n"10421043 separatorLine ="######## everything below this line is just the diff #######\n"10441045(handle, fileName) = tempfile.mkstemp()1046 tmpFile = os.fdopen(handle,"w+")1047if self.isWindows:1048 submitTemplate = submitTemplate.replace("\n","\r\n")1049 separatorLine = separatorLine.replace("\n","\r\n")1050 newdiff = newdiff.replace("\n","\r\n")1051 tmpFile.write(submitTemplate + separatorLine + diff + newdiff)1052 tmpFile.close()10531054if self.edit_template(fileName):1055# read the edited message and submit1056 tmpFile =open(fileName,"rb")1057 message = tmpFile.read()1058 tmpFile.close()1059 submitTemplate = message[:message.index(separatorLine)]1060if self.isWindows:1061 submitTemplate = submitTemplate.replace("\r\n","\n")1062p4_write_pipe(['submit','-i'], submitTemplate)10631064if self.preserveUser:1065if p4User:1066# Get last changelist number. Cannot easily get it from1067# the submit command output as the output is1068# unmarshalled.1069 changelist = self.lastP4Changelist()1070 self.modifyChangelistUser(changelist, p4User)1071else:1072# skip this patch1073print"Submission cancelled, undoing p4 changes."1074for f in editedFiles:1075p4_revert(f)1076for f in filesToAdd:1077p4_revert(f)1078 os.remove(f)10791080 os.remove(fileName)1081else:1082 fileName ="submit.txt"1083file=open(fileName,"w+")1084file.write(self.prepareLogMessage(template, logMessage))1085file.close()1086print("Perforce submit template written as%s. "1087+"Please review/edit and then use p4 submit -i <%sto submit directly!"1088% (fileName, fileName))10891090defrun(self, args):1091iflen(args) ==0:1092 self.master =currentGitBranch()1093iflen(self.master) ==0or notgitBranchExists("refs/heads/%s"% self.master):1094die("Detecting current git branch failed!")1095eliflen(args) ==1:1096 self.master = args[0]1097if notbranchExists(self.master):1098die("Branch%sdoes not exist"% self.master)1099else:1100return False11011102 allowSubmit =gitConfig("git-p4.allowSubmit")1103iflen(allowSubmit) >0and not self.master in allowSubmit.split(","):1104die("%sis not in git-p4.allowSubmit"% self.master)11051106[upstream, settings] =findUpstreamBranchPoint()1107 self.depotPath = settings['depot-paths'][0]1108iflen(self.origin) ==0:1109 self.origin = upstream11101111if self.preserveUser:1112if not self.canChangeChangelists():1113die("Cannot preserve user names without p4 super-user or admin permissions")11141115if self.verbose:1116print"Origin branch is "+ self.origin11171118iflen(self.depotPath) ==0:1119print"Internal error: cannot locate perforce depot path from existing branches"1120 sys.exit(128)11211122 self.clientPath =p4Where(self.depotPath)11231124iflen(self.clientPath) ==0:1125print"Error: Cannot locate perforce checkout of%sin client view"% self.depotPath1126 sys.exit(128)11271128print"Perforce checkout for depot path%slocated at%s"% (self.depotPath, self.clientPath)1129 self.oldWorkingDirectory = os.getcwd()11301131# ensure the clientPath exists1132if not os.path.exists(self.clientPath):1133 os.makedirs(self.clientPath)11341135chdir(self.clientPath)1136print"Synchronizing p4 checkout..."1137p4_sync("...")1138 self.check()11391140 commits = []1141for line inread_pipe_lines("git rev-list --no-merges%s..%s"% (self.origin, self.master)):1142 commits.append(line.strip())1143 commits.reverse()11441145if self.preserveUser or(gitConfig("git-p4.skipUserNameCheck") =="true"):1146 self.checkAuthorship =False1147else:1148 self.checkAuthorship =True11491150if self.preserveUser:1151 self.checkValidP4Users(commits)11521153whilelen(commits) >0:1154 commit = commits[0]1155 commits = commits[1:]1156 self.applyCommit(commit)1157if not self.interactive:1158break11591160iflen(commits) ==0:1161print"All changes applied!"1162chdir(self.oldWorkingDirectory)11631164 sync =P4Sync()1165 sync.run([])11661167 rebase =P4Rebase()1168 rebase.rebase()11691170return True11711172classView(object):1173"""Represent a p4 view ("p4 help views"), and map files in a1174 repo according to the view."""11751176classPath(object):1177"""A depot or client path, possibly containing wildcards.1178 The only one supported is ... at the end, currently.1179 Initialize with the full path, with //depot or //client."""11801181def__init__(self, path, is_depot):1182 self.path = path1183 self.is_depot = is_depot1184 self.find_wildcards()1185# remember the prefix bit, useful for relative mappings1186 m = re.match("(//[^/]+/)", self.path)1187if not m:1188die("Path%sdoes not start with //prefix/"% self.path)1189 prefix = m.group(1)1190if not self.is_depot:1191# strip //client/ on client paths1192 self.path = self.path[len(prefix):]11931194deffind_wildcards(self):1195"""Make sure wildcards are valid, and set up internal1196 variables."""11971198 self.ends_triple_dot =False1199# There are three wildcards allowed in p4 views1200# (see "p4 help views"). This code knows how to1201# handle "..." (only at the end), but cannot deal with1202# "%%n" or "*". Only check the depot_side, as p4 should1203# validate that the client_side matches too.1204if re.search(r'%%[1-9]', self.path):1205die("Can't handle%%n wildcards in view:%s"% self.path)1206if self.path.find("*") >=0:1207die("Can't handle * wildcards in view:%s"% self.path)1208 triple_dot_index = self.path.find("...")1209if triple_dot_index >=0:1210if not self.path.endswith("..."):1211die("Can handle ... wildcard only at end of path:%s"%1212 self.path)1213 self.ends_triple_dot =True12141215defensure_compatible(self, other_path):1216"""Make sure the wildcards agree."""1217if self.ends_triple_dot != other_path.ends_triple_dot:1218die("Both paths must end with ... if either does;\n"+1219"paths:%s %s"% (self.path, other_path.path))12201221defmatch_wildcards(self, test_path):1222"""See if this test_path matches us, and fill in the value1223 of the wildcards if so. Returns a tuple of1224 (True|False, wildcards[]). For now, only the ... at end1225 is supported, so at most one wildcard."""1226if self.ends_triple_dot:1227 dotless = self.path[:-3]1228if test_path.startswith(dotless):1229 wildcard = test_path[len(dotless):]1230return(True, [ wildcard ])1231else:1232if test_path == self.path:1233return(True, [])1234return(False, [])12351236defmatch(self, test_path):1237"""Just return if it matches; don't bother with the wildcards."""1238 b, _ = self.match_wildcards(test_path)1239return b12401241deffill_in_wildcards(self, wildcards):1242"""Return the relative path, with the wildcards filled in1243 if there are any."""1244if self.ends_triple_dot:1245return self.path[:-3] + wildcards[0]1246else:1247return self.path12481249classMapping(object):1250def__init__(self, depot_side, client_side, overlay, exclude):1251# depot_side is without the trailing /... if it had one1252 self.depot_side = View.Path(depot_side, is_depot=True)1253 self.client_side = View.Path(client_side, is_depot=False)1254 self.overlay = overlay # started with "+"1255 self.exclude = exclude # started with "-"1256assert not(self.overlay and self.exclude)1257 self.depot_side.ensure_compatible(self.client_side)12581259def__str__(self):1260 c =" "1261if self.overlay:1262 c ="+"1263if self.exclude:1264 c ="-"1265return"View.Mapping:%s%s->%s"% \1266(c, self.depot_side, self.client_side)12671268defmap_depot_to_client(self, depot_path):1269"""Calculate the client path if using this mapping on the1270 given depot path; does not consider the effect of other1271 mappings in a view. Even excluded mappings are returned."""1272 matches, wildcards = self.depot_side.match_wildcards(depot_path)1273if not matches:1274return""1275 client_path = self.client_side.fill_in_wildcards(wildcards)1276return client_path12771278#1279# View methods1280#1281def__init__(self):1282 self.mappings = []12831284defappend(self, view_line):1285"""Parse a view line, splitting it into depot and client1286 sides. Append to self.mappings, preserving order."""12871288# Split the view line into exactly two words. P4 enforces1289# structure on these lines that simplifies this quite a bit.1290#1291# Either or both words may be double-quoted.1292# Single quotes do not matter.1293# Double-quote marks cannot occur inside the words.1294# A + or - prefix is also inside the quotes.1295# There are no quotes unless they contain a space.1296# The line is already white-space stripped.1297# The two words are separated by a single space.1298#1299if view_line[0] =='"':1300# First word is double quoted. Find its end.1301 close_quote_index = view_line.find('"',1)1302if close_quote_index <=0:1303die("No first-word closing quote found:%s"% view_line)1304 depot_side = view_line[1:close_quote_index]1305# skip closing quote and space1306 rhs_index = close_quote_index +1+11307else:1308 space_index = view_line.find(" ")1309if space_index <=0:1310die("No word-splitting space found:%s"% view_line)1311 depot_side = view_line[0:space_index]1312 rhs_index = space_index +113131314if view_line[rhs_index] =='"':1315# Second word is double quoted. Make sure there is a1316# double quote at the end too.1317if not view_line.endswith('"'):1318die("View line with rhs quote should end with one:%s"%1319 view_line)1320# skip the quotes1321 client_side = view_line[rhs_index+1:-1]1322else:1323 client_side = view_line[rhs_index:]13241325# prefix + means overlay on previous mapping1326 overlay =False1327if depot_side.startswith("+"):1328 overlay =True1329 depot_side = depot_side[1:]13301331# prefix - means exclude this path1332 exclude =False1333if depot_side.startswith("-"):1334 exclude =True1335 depot_side = depot_side[1:]13361337 m = View.Mapping(depot_side, client_side, overlay, exclude)1338 self.mappings.append(m)13391340defmap_in_client(self, depot_path):1341"""Return the relative location in the client where this1342 depot file should live. Returns "" if the file should1343 not be mapped in the client."""13441345 paths_filled = []1346 client_path =""13471348# look at later entries first1349for m in self.mappings[::-1]:13501351# see where will this path end up in the client1352 p = m.map_depot_to_client(depot_path)13531354if p =="":1355# Depot path does not belong in client. Must remember1356# this, as previous items should not cause files to1357# exist in this path either. Remember that the list is1358# being walked from the end, which has higher precedence.1359# Overlap mappings do not exclude previous mappings.1360if not m.overlay:1361 paths_filled.append(m.client_side)13621363else:1364# This mapping matched; no need to search any further.1365# But, the mapping could be rejected if the client path1366# has already been claimed by an earlier mapping.1367 already_mapped_in_client =False1368for f in paths_filled:1369# this is View.Path.match1370if f.match(p):1371 already_mapped_in_client =True1372break1373if not already_mapped_in_client:1374# Include this file, unless it is from a line that1375# explicitly said to exclude it.1376if not m.exclude:1377 client_path = p13781379# a match, even if rejected, always stops the search1380break13811382return client_path13831384classP4Sync(Command, P4UserMap):1385 delete_actions = ("delete","move/delete","purge")13861387def__init__(self):1388 Command.__init__(self)1389 P4UserMap.__init__(self)1390 self.options = [1391 optparse.make_option("--branch", dest="branch"),1392 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),1393 optparse.make_option("--changesfile", dest="changesFile"),1394 optparse.make_option("--silent", dest="silent", action="store_true"),1395 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),1396 optparse.make_option("--verbose", dest="verbose", action="store_true"),1397 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",1398help="Import into refs/heads/ , not refs/remotes"),1399 optparse.make_option("--max-changes", dest="maxChanges"),1400 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',1401help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),1402 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',1403help="Only sync files that are included in the Perforce Client Spec")1404]1405 self.description ="""Imports from Perforce into a git repository.\n1406 example:1407 //depot/my/project/ -- to import the current head1408 //depot/my/project/@all -- to import everything1409 //depot/my/project/@1,6 -- to import only from revision 1 to 614101411 (a ... is not needed in the path p4 specification, it's added implicitly)"""14121413 self.usage +=" //depot/path[@revRange]"1414 self.silent =False1415 self.createdBranches =set()1416 self.committedChanges =set()1417 self.branch =""1418 self.detectBranches =False1419 self.detectLabels =False1420 self.changesFile =""1421 self.syncWithOrigin =True1422 self.verbose =False1423 self.importIntoRemotes =True1424 self.maxChanges =""1425 self.isWindows = (platform.system() =="Windows")1426 self.keepRepoPath =False1427 self.depotPaths =None1428 self.p4BranchesInGit = []1429 self.cloneExclude = []1430 self.useClientSpec =False1431 self.clientSpecDirs =None1432 self.tempBranches = []1433 self.tempBranchLocation ="git-p4-tmp"14341435ifgitConfig("git-p4.syncFromOrigin") =="false":1436 self.syncWithOrigin =False14371438#1439# P4 wildcards are not allowed in filenames. P4 complains1440# if you simply add them, but you can force it with "-f", in1441# which case it translates them into %xx encoding internally.1442# Search for and fix just these four characters. Do % last so1443# that fixing it does not inadvertently create new %-escapes.1444#1445defwildcard_decode(self, path):1446# Cannot have * in a filename in windows; untested as to1447# what p4 would do in such a case.1448if not self.isWindows:1449 path = path.replace("%2A","*")1450 path = path.replace("%23","#") \1451.replace("%40","@") \1452.replace("%25","%")1453return path14541455# Force a checkpoint in fast-import and wait for it to finish1456defcheckpoint(self):1457 self.gitStream.write("checkpoint\n\n")1458 self.gitStream.write("progress checkpoint\n\n")1459 out = self.gitOutput.readline()1460if self.verbose:1461print"checkpoint finished: "+ out14621463defextractFilesFromCommit(self, commit):1464 self.cloneExclude = [re.sub(r"\.\.\.$","", path)1465for path in self.cloneExclude]1466 files = []1467 fnum =01468while commit.has_key("depotFile%s"% fnum):1469 path = commit["depotFile%s"% fnum]14701471if[p for p in self.cloneExclude1472ifp4PathStartsWith(path, p)]:1473 found =False1474else:1475 found = [p for p in self.depotPaths1476ifp4PathStartsWith(path, p)]1477if not found:1478 fnum = fnum +11479continue14801481file= {}1482file["path"] = path1483file["rev"] = commit["rev%s"% fnum]1484file["action"] = commit["action%s"% fnum]1485file["type"] = commit["type%s"% fnum]1486 files.append(file)1487 fnum = fnum +11488return files14891490defstripRepoPath(self, path, prefixes):1491if self.useClientSpec:1492return self.clientSpecDirs.map_in_client(path)14931494if self.keepRepoPath:1495 prefixes = [re.sub("^(//[^/]+/).*", r'\1', prefixes[0])]14961497for p in prefixes:1498ifp4PathStartsWith(path, p):1499 path = path[len(p):]15001501return path15021503defsplitFilesIntoBranches(self, commit):1504 branches = {}1505 fnum =01506while commit.has_key("depotFile%s"% fnum):1507 path = commit["depotFile%s"% fnum]1508 found = [p for p in self.depotPaths1509ifp4PathStartsWith(path, p)]1510if not found:1511 fnum = fnum +11512continue15131514file= {}1515file["path"] = path1516file["rev"] = commit["rev%s"% fnum]1517file["action"] = commit["action%s"% fnum]1518file["type"] = commit["type%s"% fnum]1519 fnum = fnum +115201521 relPath = self.stripRepoPath(path, self.depotPaths)15221523for branch in self.knownBranches.keys():15241525# add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.21526if relPath.startswith(branch +"/"):1527if branch not in branches:1528 branches[branch] = []1529 branches[branch].append(file)1530break15311532return branches15331534# output one file from the P4 stream1535# - helper for streamP4Files15361537defstreamOneP4File(self,file, contents):1538 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)1539 relPath = self.wildcard_decode(relPath)1540if verbose:1541 sys.stderr.write("%s\n"% relPath)15421543(type_base, type_mods) =split_p4_type(file["type"])15441545 git_mode ="100644"1546if"x"in type_mods:1547 git_mode ="100755"1548if type_base =="symlink":1549 git_mode ="120000"1550# p4 print on a symlink contains "target\n"; remove the newline1551 data =''.join(contents)1552 contents = [data[:-1]]15531554if type_base =="utf16":1555# p4 delivers different text in the python output to -G1556# than it does when using "print -o", or normal p4 client1557# operations. utf16 is converted to ascii or utf8, perhaps.1558# But ascii text saved as -t utf16 is completely mangled.1559# Invoke print -o to get the real contents.1560 text =p4_read_pipe(['print','-q','-o','-',file['depotFile']])1561 contents = [ text ]15621563if type_base =="apple":1564# Apple filetype files will be streamed as a concatenation of1565# its appledouble header and the contents. This is useless1566# on both macs and non-macs. If using "print -q -o xx", it1567# will create "xx" with the data, and "%xx" with the header.1568# This is also not very useful.1569#1570# Ideally, someday, this script can learn how to generate1571# appledouble files directly and import those to git, but1572# non-mac machines can never find a use for apple filetype.1573print"\nIgnoring apple filetype file%s"%file['depotFile']1574return15751576# Perhaps windows wants unicode, utf16 newlines translated too;1577# but this is not doing it.1578if self.isWindows and type_base =="text":1579 mangled = []1580for data in contents:1581 data = data.replace("\r\n","\n")1582 mangled.append(data)1583 contents = mangled15841585# Note that we do not try to de-mangle keywords on utf16 files,1586# even though in theory somebody may want that.1587if type_base in("text","unicode","binary"):1588if"ko"in type_mods:1589 text =''.join(contents)1590 text = re.sub(r'\$(Id|Header):[^$]*\$', r'$\1$', text)1591 contents = [ text ]1592elif"k"in type_mods:1593 text =''.join(contents)1594 text = re.sub(r'\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$', r'$\1$', text)1595 contents = [ text ]15961597 self.gitStream.write("M%sinline%s\n"% (git_mode, relPath))15981599# total length...1600 length =01601for d in contents:1602 length = length +len(d)16031604 self.gitStream.write("data%d\n"% length)1605for d in contents:1606 self.gitStream.write(d)1607 self.gitStream.write("\n")16081609defstreamOneP4Deletion(self,file):1610 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)1611if verbose:1612 sys.stderr.write("delete%s\n"% relPath)1613 self.gitStream.write("D%s\n"% relPath)16141615# handle another chunk of streaming data1616defstreamP4FilesCb(self, marshalled):16171618if marshalled.has_key('depotFile')and self.stream_have_file_info:1619# start of a new file - output the old one first1620 self.streamOneP4File(self.stream_file, self.stream_contents)1621 self.stream_file = {}1622 self.stream_contents = []1623 self.stream_have_file_info =False16241625# pick up the new file information... for the1626# 'data' field we need to append to our array1627for k in marshalled.keys():1628if k =='data':1629 self.stream_contents.append(marshalled['data'])1630else:1631 self.stream_file[k] = marshalled[k]16321633 self.stream_have_file_info =True16341635# Stream directly from "p4 files" into "git fast-import"1636defstreamP4Files(self, files):1637 filesForCommit = []1638 filesToRead = []1639 filesToDelete = []16401641for f in files:1642# if using a client spec, only add the files that have1643# a path in the client1644if self.clientSpecDirs:1645if self.clientSpecDirs.map_in_client(f['path']) =="":1646continue16471648 filesForCommit.append(f)1649if f['action']in self.delete_actions:1650 filesToDelete.append(f)1651else:1652 filesToRead.append(f)16531654# deleted files...1655for f in filesToDelete:1656 self.streamOneP4Deletion(f)16571658iflen(filesToRead) >0:1659 self.stream_file = {}1660 self.stream_contents = []1661 self.stream_have_file_info =False16621663# curry self argument1664defstreamP4FilesCbSelf(entry):1665 self.streamP4FilesCb(entry)16661667 fileArgs = ['%s#%s'% (f['path'], f['rev'])for f in filesToRead]16681669p4CmdList(["-x","-","print"],1670 stdin=fileArgs,1671 cb=streamP4FilesCbSelf)16721673# do the last chunk1674if self.stream_file.has_key('depotFile'):1675 self.streamOneP4File(self.stream_file, self.stream_contents)16761677defmake_email(self, userid):1678if userid in self.users:1679return self.users[userid]1680else:1681return"%s<a@b>"% userid16821683defcommit(self, details, files, branch, branchPrefixes, parent =""):1684 epoch = details["time"]1685 author = details["user"]1686 self.branchPrefixes = branchPrefixes16871688if self.verbose:1689print"commit into%s"% branch16901691# start with reading files; if that fails, we should not1692# create a commit.1693 new_files = []1694for f in files:1695if[p for p in branchPrefixes ifp4PathStartsWith(f['path'], p)]:1696 new_files.append(f)1697else:1698 sys.stderr.write("Ignoring file outside of prefix:%s\n"% f['path'])16991700 self.gitStream.write("commit%s\n"% branch)1701# gitStream.write("mark :%s\n" % details["change"])1702 self.committedChanges.add(int(details["change"]))1703 committer =""1704if author not in self.users:1705 self.getUserMapFromPerforceServer()1706 committer ="%s %s %s"% (self.make_email(author), epoch, self.tz)17071708 self.gitStream.write("committer%s\n"% committer)17091710 self.gitStream.write("data <<EOT\n")1711 self.gitStream.write(details["desc"])1712 self.gitStream.write("\n[git-p4: depot-paths =\"%s\": change =%s"1713% (','.join(branchPrefixes), details["change"]))1714iflen(details['options']) >0:1715 self.gitStream.write(": options =%s"% details['options'])1716 self.gitStream.write("]\nEOT\n\n")17171718iflen(parent) >0:1719if self.verbose:1720print"parent%s"% parent1721 self.gitStream.write("from%s\n"% parent)17221723 self.streamP4Files(new_files)1724 self.gitStream.write("\n")17251726 change =int(details["change"])17271728if self.labels.has_key(change):1729 label = self.labels[change]1730 labelDetails = label[0]1731 labelRevisions = label[1]1732if self.verbose:1733print"Change%sis labelled%s"% (change, labelDetails)17341735 files =p4CmdList(["files"] + ["%s...@%s"% (p, change)1736for p in branchPrefixes])17371738iflen(files) ==len(labelRevisions):17391740 cleanedFiles = {}1741for info in files:1742if info["action"]in self.delete_actions:1743continue1744 cleanedFiles[info["depotFile"]] = info["rev"]17451746if cleanedFiles == labelRevisions:1747 self.gitStream.write("tag tag_%s\n"% labelDetails["label"])1748 self.gitStream.write("from%s\n"% branch)17491750 owner = labelDetails["Owner"]17511752# Try to use the owner of the p4 label, or failing that,1753# the current p4 user id.1754if owner:1755 email = self.make_email(owner)1756else:1757 email = self.make_email(self.p4UserId())1758 tagger ="%s %s %s"% (email, epoch, self.tz)17591760 self.gitStream.write("tagger%s\n"% tagger)17611762 description = labelDetails["Description"]1763 self.gitStream.write("data%d\n"%len(description))1764 self.gitStream.write(description)1765 self.gitStream.write("\n")17661767else:1768if not self.silent:1769print("Tag%sdoes not match with change%s: files do not match."1770% (labelDetails["label"], change))17711772else:1773if not self.silent:1774print("Tag%sdoes not match with change%s: file count is different."1775% (labelDetails["label"], change))17761777defgetLabels(self):1778 self.labels = {}17791780 l =p4CmdList(["labels"] + ["%s..."% p for p in self.depotPaths])1781iflen(l) >0and not self.silent:1782print"Finding files belonging to labels in%s"% `self.depotPaths`17831784for output in l:1785 label = output["label"]1786 revisions = {}1787 newestChange =01788if self.verbose:1789print"Querying files for label%s"% label1790forfileinp4CmdList(["files"] +1791["%s...@%s"% (p, label)1792for p in self.depotPaths]):1793 revisions[file["depotFile"]] =file["rev"]1794 change =int(file["change"])1795if change > newestChange:1796 newestChange = change17971798 self.labels[newestChange] = [output, revisions]17991800if self.verbose:1801print"Label changes:%s"% self.labels.keys()18021803defguessProjectName(self):1804for p in self.depotPaths:1805if p.endswith("/"):1806 p = p[:-1]1807 p = p[p.strip().rfind("/") +1:]1808if not p.endswith("/"):1809 p +="/"1810return p18111812defgetBranchMapping(self):1813 lostAndFoundBranches =set()18141815 user =gitConfig("git-p4.branchUser")1816iflen(user) >0:1817 command ="branches -u%s"% user1818else:1819 command ="branches"18201821for info inp4CmdList(command):1822 details =p4Cmd(["branch","-o", info["branch"]])1823 viewIdx =01824while details.has_key("View%s"% viewIdx):1825 paths = details["View%s"% viewIdx].split(" ")1826 viewIdx = viewIdx +11827# require standard //depot/foo/... //depot/bar/... mapping1828iflen(paths) !=2or not paths[0].endswith("/...")or not paths[1].endswith("/..."):1829continue1830 source = paths[0]1831 destination = paths[1]1832## HACK1833ifp4PathStartsWith(source, self.depotPaths[0])andp4PathStartsWith(destination, self.depotPaths[0]):1834 source = source[len(self.depotPaths[0]):-4]1835 destination = destination[len(self.depotPaths[0]):-4]18361837if destination in self.knownBranches:1838if not self.silent:1839print"p4 branch%sdefines a mapping from%sto%s"% (info["branch"], source, destination)1840print"but there exists another mapping from%sto%salready!"% (self.knownBranches[destination], destination)1841continue18421843 self.knownBranches[destination] = source18441845 lostAndFoundBranches.discard(destination)18461847if source not in self.knownBranches:1848 lostAndFoundBranches.add(source)18491850# Perforce does not strictly require branches to be defined, so we also1851# check git config for a branch list.1852#1853# Example of branch definition in git config file:1854# [git-p4]1855# branchList=main:branchA1856# branchList=main:branchB1857# branchList=branchA:branchC1858 configBranches =gitConfigList("git-p4.branchList")1859for branch in configBranches:1860if branch:1861(source, destination) = branch.split(":")1862 self.knownBranches[destination] = source18631864 lostAndFoundBranches.discard(destination)18651866if source not in self.knownBranches:1867 lostAndFoundBranches.add(source)186818691870for branch in lostAndFoundBranches:1871 self.knownBranches[branch] = branch18721873defgetBranchMappingFromGitBranches(self):1874 branches =p4BranchesInGit(self.importIntoRemotes)1875for branch in branches.keys():1876if branch =="master":1877 branch ="main"1878else:1879 branch = branch[len(self.projectName):]1880 self.knownBranches[branch] = branch18811882deflistExistingP4GitBranches(self):1883# branches holds mapping from name to commit1884 branches =p4BranchesInGit(self.importIntoRemotes)1885 self.p4BranchesInGit = branches.keys()1886for branch in branches.keys():1887 self.initialParents[self.refPrefix + branch] = branches[branch]18881889defupdateOptionDict(self, d):1890 option_keys = {}1891if self.keepRepoPath:1892 option_keys['keepRepoPath'] =118931894 d["options"] =' '.join(sorted(option_keys.keys()))18951896defreadOptions(self, d):1897 self.keepRepoPath = (d.has_key('options')1898and('keepRepoPath'in d['options']))18991900defgitRefForBranch(self, branch):1901if branch =="main":1902return self.refPrefix +"master"19031904iflen(branch) <=0:1905return branch19061907return self.refPrefix + self.projectName + branch19081909defgitCommitByP4Change(self, ref, change):1910if self.verbose:1911print"looking in ref "+ ref +" for change%susing bisect..."% change19121913 earliestCommit =""1914 latestCommit =parseRevision(ref)19151916while True:1917if self.verbose:1918print"trying: earliest%slatest%s"% (earliestCommit, latestCommit)1919 next =read_pipe("git rev-list --bisect%s %s"% (latestCommit, earliestCommit)).strip()1920iflen(next) ==0:1921if self.verbose:1922print"argh"1923return""1924 log =extractLogMessageFromGitCommit(next)1925 settings =extractSettingsGitLog(log)1926 currentChange =int(settings['change'])1927if self.verbose:1928print"current change%s"% currentChange19291930if currentChange == change:1931if self.verbose:1932print"found%s"% next1933return next19341935if currentChange < change:1936 earliestCommit ="^%s"% next1937else:1938 latestCommit ="%s"% next19391940return""19411942defimportNewBranch(self, branch, maxChange):1943# make fast-import flush all changes to disk and update the refs using the checkpoint1944# command so that we can try to find the branch parent in the git history1945 self.gitStream.write("checkpoint\n\n");1946 self.gitStream.flush();1947 branchPrefix = self.depotPaths[0] + branch +"/"1948range="@1,%s"% maxChange1949#print "prefix" + branchPrefix1950 changes =p4ChangesForPaths([branchPrefix],range)1951iflen(changes) <=0:1952return False1953 firstChange = changes[0]1954#print "first change in branch: %s" % firstChange1955 sourceBranch = self.knownBranches[branch]1956 sourceDepotPath = self.depotPaths[0] + sourceBranch1957 sourceRef = self.gitRefForBranch(sourceBranch)1958#print "source " + sourceBranch19591960 branchParentChange =int(p4Cmd(["changes","-m","1","%s...@1,%s"% (sourceDepotPath, firstChange)])["change"])1961#print "branch parent: %s" % branchParentChange1962 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)1963iflen(gitParent) >0:1964 self.initialParents[self.gitRefForBranch(branch)] = gitParent1965#print "parent git commit: %s" % gitParent19661967 self.importChanges(changes)1968return True19691970defsearchParent(self, parent, branch, target):1971 parentFound =False1972for blob inread_pipe_lines(["git","rev-list","--reverse","--no-merges", parent]):1973 blob = blob.strip()1974iflen(read_pipe(["git","diff-tree", blob, target])) ==0:1975 parentFound =True1976if self.verbose:1977print"Found parent of%sin commit%s"% (branch, blob)1978break1979if parentFound:1980return blob1981else:1982return None19831984defimportChanges(self, changes):1985 cnt =11986for change in changes:1987 description =p4Cmd("describe%s"% change)1988 self.updateOptionDict(description)19891990if not self.silent:1991 sys.stdout.write("\rImporting revision%s(%s%%)"% (change, cnt *100/len(changes)))1992 sys.stdout.flush()1993 cnt = cnt +119941995try:1996if self.detectBranches:1997 branches = self.splitFilesIntoBranches(description)1998for branch in branches.keys():1999## HACK --hwn2000 branchPrefix = self.depotPaths[0] + branch +"/"20012002 parent =""20032004 filesForCommit = branches[branch]20052006if self.verbose:2007print"branch is%s"% branch20082009 self.updatedBranches.add(branch)20102011if branch not in self.createdBranches:2012 self.createdBranches.add(branch)2013 parent = self.knownBranches[branch]2014if parent == branch:2015 parent =""2016else:2017 fullBranch = self.projectName + branch2018if fullBranch not in self.p4BranchesInGit:2019if not self.silent:2020print("\nImporting new branch%s"% fullBranch);2021if self.importNewBranch(branch, change -1):2022 parent =""2023 self.p4BranchesInGit.append(fullBranch)2024if not self.silent:2025print("\nResuming with change%s"% change);20262027if self.verbose:2028print"parent determined through known branches:%s"% parent20292030 branch = self.gitRefForBranch(branch)2031 parent = self.gitRefForBranch(parent)20322033if self.verbose:2034print"looking for initial parent for%s; current parent is%s"% (branch, parent)20352036iflen(parent) ==0and branch in self.initialParents:2037 parent = self.initialParents[branch]2038del self.initialParents[branch]20392040 blob =None2041iflen(parent) >0:2042 tempBranch = os.path.join(self.tempBranchLocation,"%d"% (change))2043if self.verbose:2044print"Creating temporary branch: "+ tempBranch2045 self.commit(description, filesForCommit, tempBranch, [branchPrefix])2046 self.tempBranches.append(tempBranch)2047 self.checkpoint()2048 blob = self.searchParent(parent, branch, tempBranch)2049if blob:2050 self.commit(description, filesForCommit, branch, [branchPrefix], blob)2051else:2052if self.verbose:2053print"Parent of%snot found. Committing into head of%s"% (branch, parent)2054 self.commit(description, filesForCommit, branch, [branchPrefix], parent)2055else:2056 files = self.extractFilesFromCommit(description)2057 self.commit(description, files, self.branch, self.depotPaths,2058 self.initialParent)2059 self.initialParent =""2060exceptIOError:2061print self.gitError.read()2062 sys.exit(1)20632064defimportHeadRevision(self, revision):2065print"Doing initial import of%sfrom revision%sinto%s"% (' '.join(self.depotPaths), revision, self.branch)20662067 details = {}2068 details["user"] ="git perforce import user"2069 details["desc"] = ("Initial import of%sfrom the state at revision%s\n"2070% (' '.join(self.depotPaths), revision))2071 details["change"] = revision2072 newestRevision =020732074 fileCnt =02075 fileArgs = ["%s...%s"% (p,revision)for p in self.depotPaths]20762077for info inp4CmdList(["files"] + fileArgs):20782079if'code'in info and info['code'] =='error':2080 sys.stderr.write("p4 returned an error:%s\n"2081% info['data'])2082if info['data'].find("must refer to client") >=0:2083 sys.stderr.write("This particular p4 error is misleading.\n")2084 sys.stderr.write("Perhaps the depot path was misspelled.\n");2085 sys.stderr.write("Depot path:%s\n"%" ".join(self.depotPaths))2086 sys.exit(1)2087if'p4ExitCode'in info:2088 sys.stderr.write("p4 exitcode:%s\n"% info['p4ExitCode'])2089 sys.exit(1)209020912092 change =int(info["change"])2093if change > newestRevision:2094 newestRevision = change20952096if info["action"]in self.delete_actions:2097# don't increase the file cnt, otherwise details["depotFile123"] will have gaps!2098#fileCnt = fileCnt + 12099continue21002101for prop in["depotFile","rev","action","type"]:2102 details["%s%s"% (prop, fileCnt)] = info[prop]21032104 fileCnt = fileCnt +121052106 details["change"] = newestRevision21072108# Use time from top-most change so that all git-p4 clones of2109# the same p4 repo have the same commit SHA1s.2110 res =p4CmdList("describe -s%d"% newestRevision)2111 newestTime =None2112for r in res:2113if r.has_key('time'):2114 newestTime =int(r['time'])2115if newestTime is None:2116die("\"describe -s\"on newest change%ddid not give a time")2117 details["time"] = newestTime21182119 self.updateOptionDict(details)2120try:2121 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPaths)2122exceptIOError:2123print"IO error with git fast-import. Is your git version recent enough?"2124print self.gitError.read()212521262127defgetClientSpec(self):2128 specList =p4CmdList("client -o")2129iflen(specList) !=1:2130die('Output from "client -o" is%dlines, expecting 1'%2131len(specList))21322133# dictionary of all client parameters2134 entry = specList[0]21352136# just the keys that start with "View"2137 view_keys = [ k for k in entry.keys()if k.startswith("View") ]21382139# hold this new View2140 view =View()21412142# append the lines, in order, to the view2143for view_num inrange(len(view_keys)):2144 k ="View%d"% view_num2145if k not in view_keys:2146die("Expected view key%smissing"% k)2147 view.append(entry[k])21482149 self.clientSpecDirs = view2150if self.verbose:2151for i, m inenumerate(self.clientSpecDirs.mappings):2152print"clientSpecDirs%d:%s"% (i,str(m))21532154defrun(self, args):2155 self.depotPaths = []2156 self.changeRange =""2157 self.initialParent =""2158 self.previousDepotPaths = []21592160# map from branch depot path to parent branch2161 self.knownBranches = {}2162 self.initialParents = {}2163 self.hasOrigin =originP4BranchesExist()2164if not self.syncWithOrigin:2165 self.hasOrigin =False21662167if self.importIntoRemotes:2168 self.refPrefix ="refs/remotes/p4/"2169else:2170 self.refPrefix ="refs/heads/p4/"21712172if self.syncWithOrigin and self.hasOrigin:2173if not self.silent:2174print"Syncing with origin first by calling git fetch origin"2175system("git fetch origin")21762177iflen(self.branch) ==0:2178 self.branch = self.refPrefix +"master"2179ifgitBranchExists("refs/heads/p4")and self.importIntoRemotes:2180system("git update-ref%srefs/heads/p4"% self.branch)2181system("git branch -D p4");2182# create it /after/ importing, when master exists2183if notgitBranchExists(self.refPrefix +"HEAD")and self.importIntoRemotes andgitBranchExists(self.branch):2184system("git symbolic-ref%sHEAD%s"% (self.refPrefix, self.branch))21852186if not self.useClientSpec:2187ifgitConfig("git-p4.useclientspec","--bool") =="true":2188 self.useClientSpec =True2189if self.useClientSpec:2190 self.getClientSpec()21912192# TODO: should always look at previous commits,2193# merge with previous imports, if possible.2194if args == []:2195if self.hasOrigin:2196createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)2197 self.listExistingP4GitBranches()21982199iflen(self.p4BranchesInGit) >1:2200if not self.silent:2201print"Importing from/into multiple branches"2202 self.detectBranches =True22032204if self.verbose:2205print"branches:%s"% self.p4BranchesInGit22062207 p4Change =02208for branch in self.p4BranchesInGit:2209 logMsg =extractLogMessageFromGitCommit(self.refPrefix + branch)22102211 settings =extractSettingsGitLog(logMsg)22122213 self.readOptions(settings)2214if(settings.has_key('depot-paths')2215and settings.has_key('change')):2216 change =int(settings['change']) +12217 p4Change =max(p4Change, change)22182219 depotPaths =sorted(settings['depot-paths'])2220if self.previousDepotPaths == []:2221 self.previousDepotPaths = depotPaths2222else:2223 paths = []2224for(prev, cur)inzip(self.previousDepotPaths, depotPaths):2225 prev_list = prev.split("/")2226 cur_list = cur.split("/")2227for i inrange(0,min(len(cur_list),len(prev_list))):2228if cur_list[i] <> prev_list[i]:2229 i = i -12230break22312232 paths.append("/".join(cur_list[:i +1]))22332234 self.previousDepotPaths = paths22352236if p4Change >0:2237 self.depotPaths =sorted(self.previousDepotPaths)2238 self.changeRange ="@%s,#head"% p4Change2239if not self.detectBranches:2240 self.initialParent =parseRevision(self.branch)2241if not self.silent and not self.detectBranches:2242print"Performing incremental import into%sgit branch"% self.branch22432244if not self.branch.startswith("refs/"):2245 self.branch ="refs/heads/"+ self.branch22462247iflen(args) ==0and self.depotPaths:2248if not self.silent:2249print"Depot paths:%s"%' '.join(self.depotPaths)2250else:2251if self.depotPaths and self.depotPaths != args:2252print("previous import used depot path%sand now%swas specified. "2253"This doesn't work!"% (' '.join(self.depotPaths),2254' '.join(args)))2255 sys.exit(1)22562257 self.depotPaths =sorted(args)22582259 revision =""2260 self.users = {}22612262# Make sure no revision specifiers are used when --changesfile2263# is specified.2264 bad_changesfile =False2265iflen(self.changesFile) >0:2266for p in self.depotPaths:2267if p.find("@") >=0or p.find("#") >=0:2268 bad_changesfile =True2269break2270if bad_changesfile:2271die("Option --changesfile is incompatible with revision specifiers")22722273 newPaths = []2274for p in self.depotPaths:2275if p.find("@") != -1:2276 atIdx = p.index("@")2277 self.changeRange = p[atIdx:]2278if self.changeRange =="@all":2279 self.changeRange =""2280elif','not in self.changeRange:2281 revision = self.changeRange2282 self.changeRange =""2283 p = p[:atIdx]2284elif p.find("#") != -1:2285 hashIdx = p.index("#")2286 revision = p[hashIdx:]2287 p = p[:hashIdx]2288elif self.previousDepotPaths == []:2289# pay attention to changesfile, if given, else import2290# the entire p4 tree at the head revision2291iflen(self.changesFile) ==0:2292 revision ="#head"22932294 p = re.sub("\.\.\.$","", p)2295if not p.endswith("/"):2296 p +="/"22972298 newPaths.append(p)22992300 self.depotPaths = newPaths230123022303 self.loadUserMapFromCache()2304 self.labels = {}2305if self.detectLabels:2306 self.getLabels();23072308if self.detectBranches:2309## FIXME - what's a P4 projectName ?2310 self.projectName = self.guessProjectName()23112312if self.hasOrigin:2313 self.getBranchMappingFromGitBranches()2314else:2315 self.getBranchMapping()2316if self.verbose:2317print"p4-git branches:%s"% self.p4BranchesInGit2318print"initial parents:%s"% self.initialParents2319for b in self.p4BranchesInGit:2320if b !="master":23212322## FIXME2323 b = b[len(self.projectName):]2324 self.createdBranches.add(b)23252326 self.tz ="%+03d%02d"% (- time.timezone /3600, ((- time.timezone %3600) /60))23272328 importProcess = subprocess.Popen(["git","fast-import"],2329 stdin=subprocess.PIPE, stdout=subprocess.PIPE,2330 stderr=subprocess.PIPE);2331 self.gitOutput = importProcess.stdout2332 self.gitStream = importProcess.stdin2333 self.gitError = importProcess.stderr23342335if revision:2336 self.importHeadRevision(revision)2337else:2338 changes = []23392340iflen(self.changesFile) >0:2341 output =open(self.changesFile).readlines()2342 changeSet =set()2343for line in output:2344 changeSet.add(int(line))23452346for change in changeSet:2347 changes.append(change)23482349 changes.sort()2350else:2351# catch "git-p4 sync" with no new branches, in a repo that2352# does not have any existing git-p4 branches2353iflen(args) ==0and not self.p4BranchesInGit:2354die("No remote p4 branches. Perhaps you never did\"git p4 clone\"in here.");2355if self.verbose:2356print"Getting p4 changes for%s...%s"% (', '.join(self.depotPaths),2357 self.changeRange)2358 changes =p4ChangesForPaths(self.depotPaths, self.changeRange)23592360iflen(self.maxChanges) >0:2361 changes = changes[:min(int(self.maxChanges),len(changes))]23622363iflen(changes) ==0:2364if not self.silent:2365print"No changes to import!"2366return True23672368if not self.silent and not self.detectBranches:2369print"Import destination:%s"% self.branch23702371 self.updatedBranches =set()23722373 self.importChanges(changes)23742375if not self.silent:2376print""2377iflen(self.updatedBranches) >0:2378 sys.stdout.write("Updated branches: ")2379for b in self.updatedBranches:2380 sys.stdout.write("%s"% b)2381 sys.stdout.write("\n")23822383 self.gitStream.close()2384if importProcess.wait() !=0:2385die("fast-import failed:%s"% self.gitError.read())2386 self.gitOutput.close()2387 self.gitError.close()23882389# Cleanup temporary branches created during import2390if self.tempBranches != []:2391for branch in self.tempBranches:2392read_pipe("git update-ref -d%s"% branch)2393 os.rmdir(os.path.join(os.environ.get("GIT_DIR",".git"), self.tempBranchLocation))23942395return True23962397classP4Rebase(Command):2398def__init__(self):2399 Command.__init__(self)2400 self.options = [ ]2401 self.description = ("Fetches the latest revision from perforce and "2402+"rebases the current work (branch) against it")2403 self.verbose =False24042405defrun(self, args):2406 sync =P4Sync()2407 sync.run([])24082409return self.rebase()24102411defrebase(self):2412if os.system("git update-index --refresh") !=0:2413die("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.");2414iflen(read_pipe("git diff-index HEAD --")) >0:2415die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash.");24162417[upstream, settings] =findUpstreamBranchPoint()2418iflen(upstream) ==0:2419die("Cannot find upstream branchpoint for rebase")24202421# the branchpoint may be p4/foo~3, so strip off the parent2422 upstream = re.sub("~[0-9]+$","", upstream)24232424print"Rebasing the current branch onto%s"% upstream2425 oldHead =read_pipe("git rev-parse HEAD").strip()2426system("git rebase%s"% upstream)2427system("git diff-tree --stat --summary -M%sHEAD"% oldHead)2428return True24292430classP4Clone(P4Sync):2431def__init__(self):2432 P4Sync.__init__(self)2433 self.description ="Creates a new git repository and imports from Perforce into it"2434 self.usage ="usage: %prog [options] //depot/path[@revRange]"2435 self.options += [2436 optparse.make_option("--destination", dest="cloneDestination",2437 action='store', default=None,2438help="where to leave result of the clone"),2439 optparse.make_option("-/", dest="cloneExclude",2440 action="append",type="string",2441help="exclude depot path"),2442 optparse.make_option("--bare", dest="cloneBare",2443 action="store_true", default=False),2444]2445 self.cloneDestination =None2446 self.needsGit =False2447 self.cloneBare =False24482449# This is required for the "append" cloneExclude action2450defensure_value(self, attr, value):2451if nothasattr(self, attr)orgetattr(self, attr)is None:2452setattr(self, attr, value)2453returngetattr(self, attr)24542455defdefaultDestination(self, args):2456## TODO: use common prefix of args?2457 depotPath = args[0]2458 depotDir = re.sub("(@[^@]*)$","", depotPath)2459 depotDir = re.sub("(#[^#]*)$","", depotDir)2460 depotDir = re.sub(r"\.\.\.$","", depotDir)2461 depotDir = re.sub(r"/$","", depotDir)2462return os.path.split(depotDir)[1]24632464defrun(self, args):2465iflen(args) <1:2466return False24672468if self.keepRepoPath and not self.cloneDestination:2469 sys.stderr.write("Must specify destination for --keep-path\n")2470 sys.exit(1)24712472 depotPaths = args24732474if not self.cloneDestination andlen(depotPaths) >1:2475 self.cloneDestination = depotPaths[-1]2476 depotPaths = depotPaths[:-1]24772478 self.cloneExclude = ["/"+p for p in self.cloneExclude]2479for p in depotPaths:2480if not p.startswith("//"):2481return False24822483if not self.cloneDestination:2484 self.cloneDestination = self.defaultDestination(args)24852486print"Importing from%sinto%s"% (', '.join(depotPaths), self.cloneDestination)24872488if not os.path.exists(self.cloneDestination):2489 os.makedirs(self.cloneDestination)2490chdir(self.cloneDestination)24912492 init_cmd = ["git","init"]2493if self.cloneBare:2494 init_cmd.append("--bare")2495 subprocess.check_call(init_cmd)24962497if not P4Sync.run(self, depotPaths):2498return False2499if self.branch !="master":2500if self.importIntoRemotes:2501 masterbranch ="refs/remotes/p4/master"2502else:2503 masterbranch ="refs/heads/p4/master"2504ifgitBranchExists(masterbranch):2505system("git branch master%s"% masterbranch)2506if not self.cloneBare:2507system("git checkout -f")2508else:2509print"Could not detect main branch. No checkout/master branch created."25102511return True25122513classP4Branches(Command):2514def__init__(self):2515 Command.__init__(self)2516 self.options = [ ]2517 self.description = ("Shows the git branches that hold imports and their "2518+"corresponding perforce depot paths")2519 self.verbose =False25202521defrun(self, args):2522iforiginP4BranchesExist():2523createOrUpdateBranchesFromOrigin()25242525 cmdline ="git rev-parse --symbolic "2526 cmdline +=" --remotes"25272528for line inread_pipe_lines(cmdline):2529 line = line.strip()25302531if not line.startswith('p4/')or line =="p4/HEAD":2532continue2533 branch = line25342535 log =extractLogMessageFromGitCommit("refs/remotes/%s"% branch)2536 settings =extractSettingsGitLog(log)25372538print"%s<=%s(%s)"% (branch,",".join(settings["depot-paths"]), settings["change"])2539return True25402541classHelpFormatter(optparse.IndentedHelpFormatter):2542def__init__(self):2543 optparse.IndentedHelpFormatter.__init__(self)25442545defformat_description(self, description):2546if description:2547return description +"\n"2548else:2549return""25502551defprintUsage(commands):2552print"usage:%s<command> [options]"% sys.argv[0]2553print""2554print"valid commands:%s"%", ".join(commands)2555print""2556print"Try%s<command> --help for command specific help."% sys.argv[0]2557print""25582559commands = {2560"debug": P4Debug,2561"submit": P4Submit,2562"commit": P4Submit,2563"sync": P4Sync,2564"rebase": P4Rebase,2565"clone": P4Clone,2566"rollback": P4RollBack,2567"branches": P4Branches2568}256925702571defmain():2572iflen(sys.argv[1:]) ==0:2573printUsage(commands.keys())2574 sys.exit(2)25752576 cmd =""2577 cmdName = sys.argv[1]2578try:2579 klass = commands[cmdName]2580 cmd =klass()2581exceptKeyError:2582print"unknown command%s"% cmdName2583print""2584printUsage(commands.keys())2585 sys.exit(2)25862587 options = cmd.options2588 cmd.gitdir = os.environ.get("GIT_DIR",None)25892590 args = sys.argv[2:]25912592iflen(options) >0:2593if cmd.needsGit:2594 options.append(optparse.make_option("--git-dir", dest="gitdir"))25952596 parser = optparse.OptionParser(cmd.usage.replace("%prog","%prog "+ cmdName),2597 options,2598 description = cmd.description,2599 formatter =HelpFormatter())26002601(cmd, args) = parser.parse_args(sys.argv[2:], cmd);2602global verbose2603 verbose = cmd.verbose2604if cmd.needsGit:2605if cmd.gitdir ==None:2606 cmd.gitdir = os.path.abspath(".git")2607if notisValidGitDir(cmd.gitdir):2608 cmd.gitdir =read_pipe("git rev-parse --git-dir").strip()2609if os.path.exists(cmd.gitdir):2610 cdup =read_pipe("git rev-parse --show-cdup").strip()2611iflen(cdup) >0:2612chdir(cdup);26132614if notisValidGitDir(cmd.gitdir):2615ifisValidGitDir(cmd.gitdir +"/.git"):2616 cmd.gitdir +="/.git"2617else:2618die("fatal: cannot locate git repository at%s"% cmd.gitdir)26192620 os.environ["GIT_DIR"] = cmd.gitdir26212622if not cmd.run(args):2623 parser.print_help()2624 sys.exit(2)262526262627if __name__ =='__main__':2628main()