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, shutil 14 15verbose =False 16 17# Only labels/tags matching this will be imported/exported 18defaultLabelRegexp = r'[a-zA-Z0-9_\-.]+$' 19 20defp4_build_cmd(cmd): 21"""Build a suitable p4 command line. 22 23 This consolidates building and returning a p4 command line into one 24 location. It means that hooking into the environment, or other configuration 25 can be done more easily. 26 """ 27 real_cmd = ["p4"] 28 29 user =gitConfig("git-p4.user") 30iflen(user) >0: 31 real_cmd += ["-u",user] 32 33 password =gitConfig("git-p4.password") 34iflen(password) >0: 35 real_cmd += ["-P", password] 36 37 port =gitConfig("git-p4.port") 38iflen(port) >0: 39 real_cmd += ["-p", port] 40 41 host =gitConfig("git-p4.host") 42iflen(host) >0: 43 real_cmd += ["-H", host] 44 45 client =gitConfig("git-p4.client") 46iflen(client) >0: 47 real_cmd += ["-c", client] 48 49 50ifisinstance(cmd,basestring): 51 real_cmd =' '.join(real_cmd) +' '+ cmd 52else: 53 real_cmd += cmd 54return real_cmd 55 56defchdir(dir): 57# P4 uses the PWD environment variable rather than getcwd(). Since we're 58# not using the shell, we have to set it ourselves. This path could 59# be relative, so go there first, then figure out where we ended up. 60 os.chdir(dir) 61 os.environ['PWD'] = os.getcwd() 62 63defdie(msg): 64if verbose: 65raiseException(msg) 66else: 67 sys.stderr.write(msg +"\n") 68 sys.exit(1) 69 70defwrite_pipe(c, stdin): 71if verbose: 72 sys.stderr.write('Writing pipe:%s\n'%str(c)) 73 74 expand =isinstance(c,basestring) 75 p = subprocess.Popen(c, stdin=subprocess.PIPE, shell=expand) 76 pipe = p.stdin 77 val = pipe.write(stdin) 78 pipe.close() 79if p.wait(): 80die('Command failed:%s'%str(c)) 81 82return val 83 84defp4_write_pipe(c, stdin): 85 real_cmd =p4_build_cmd(c) 86returnwrite_pipe(real_cmd, stdin) 87 88defread_pipe(c, ignore_error=False): 89if verbose: 90 sys.stderr.write('Reading pipe:%s\n'%str(c)) 91 92 expand =isinstance(c,basestring) 93 p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand) 94 pipe = p.stdout 95 val = pipe.read() 96if p.wait()and not ignore_error: 97die('Command failed:%s'%str(c)) 98 99return val 100 101defp4_read_pipe(c, ignore_error=False): 102 real_cmd =p4_build_cmd(c) 103returnread_pipe(real_cmd, ignore_error) 104 105defread_pipe_lines(c): 106if verbose: 107 sys.stderr.write('Reading pipe:%s\n'%str(c)) 108 109 expand =isinstance(c, basestring) 110 p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand) 111 pipe = p.stdout 112 val = pipe.readlines() 113if pipe.close()or p.wait(): 114die('Command failed:%s'%str(c)) 115 116return val 117 118defp4_read_pipe_lines(c): 119"""Specifically invoke p4 on the command supplied. """ 120 real_cmd =p4_build_cmd(c) 121returnread_pipe_lines(real_cmd) 122 123defsystem(cmd): 124 expand =isinstance(cmd,basestring) 125if verbose: 126 sys.stderr.write("executing%s\n"%str(cmd)) 127 subprocess.check_call(cmd, shell=expand) 128 129defp4_system(cmd): 130"""Specifically invoke p4 as the system command. """ 131 real_cmd =p4_build_cmd(cmd) 132 expand =isinstance(real_cmd, basestring) 133 subprocess.check_call(real_cmd, shell=expand) 134 135defp4_integrate(src, dest): 136p4_system(["integrate","-Dt", src, dest]) 137 138defp4_sync(f, *options): 139p4_system(["sync"] +list(options) + [f]) 140 141defp4_add(f): 142p4_system(["add", f]) 143 144defp4_delete(f): 145p4_system(["delete", f]) 146 147defp4_edit(f): 148p4_system(["edit", f]) 149 150defp4_revert(f): 151p4_system(["revert", f]) 152 153defp4_reopen(type,file): 154p4_system(["reopen","-t",type,file]) 155 156# 157# Canonicalize the p4 type and return a tuple of the 158# base type, plus any modifiers. See "p4 help filetypes" 159# for a list and explanation. 160# 161defsplit_p4_type(p4type): 162 163 p4_filetypes_historical = { 164"ctempobj":"binary+Sw", 165"ctext":"text+C", 166"cxtext":"text+Cx", 167"ktext":"text+k", 168"kxtext":"text+kx", 169"ltext":"text+F", 170"tempobj":"binary+FSw", 171"ubinary":"binary+F", 172"uresource":"resource+F", 173"uxbinary":"binary+Fx", 174"xbinary":"binary+x", 175"xltext":"text+Fx", 176"xtempobj":"binary+Swx", 177"xtext":"text+x", 178"xunicode":"unicode+x", 179"xutf16":"utf16+x", 180} 181if p4type in p4_filetypes_historical: 182 p4type = p4_filetypes_historical[p4type] 183 mods ="" 184 s = p4type.split("+") 185 base = s[0] 186 mods ="" 187iflen(s) >1: 188 mods = s[1] 189return(base, mods) 190 191# 192# return the raw p4 type of a file (text, text+ko, etc) 193# 194defp4_type(file): 195 results =p4CmdList(["fstat","-T","headType",file]) 196return results[0]['headType'] 197 198# 199# Given a type base and modifier, return a regexp matching 200# the keywords that can be expanded in the file 201# 202defp4_keywords_regexp_for_type(base, type_mods): 203if base in("text","unicode","binary"): 204 kwords =None 205if"ko"in type_mods: 206 kwords ='Id|Header' 207elif"k"in type_mods: 208 kwords ='Id|Header|Author|Date|DateTime|Change|File|Revision' 209else: 210return None 211 pattern = r""" 212 \$ # Starts with a dollar, followed by... 213 (%s) # one of the keywords, followed by... 214 (:[^$]+)? # possibly an old expansion, followed by... 215 \$ # another dollar 216 """% kwords 217return pattern 218else: 219return None 220 221# 222# Given a file, return a regexp matching the possible 223# RCS keywords that will be expanded, or None for files 224# with kw expansion turned off. 225# 226defp4_keywords_regexp_for_file(file): 227if not os.path.exists(file): 228return None 229else: 230(type_base, type_mods) =split_p4_type(p4_type(file)) 231returnp4_keywords_regexp_for_type(type_base, type_mods) 232 233defsetP4ExecBit(file, mode): 234# Reopens an already open file and changes the execute bit to match 235# the execute bit setting in the passed in mode. 236 237 p4Type ="+x" 238 239if notisModeExec(mode): 240 p4Type =getP4OpenedType(file) 241 p4Type = re.sub('^([cku]?)x(.*)','\\1\\2', p4Type) 242 p4Type = re.sub('(.*?\+.*?)x(.*?)','\\1\\2', p4Type) 243if p4Type[-1] =="+": 244 p4Type = p4Type[0:-1] 245 246p4_reopen(p4Type,file) 247 248defgetP4OpenedType(file): 249# Returns the perforce file type for the given file. 250 251 result =p4_read_pipe(["opened",file]) 252 match = re.match(".*\((.+)\)\r?$", result) 253if match: 254return match.group(1) 255else: 256die("Could not determine file type for%s(result: '%s')"% (file, result)) 257 258# Return the set of all p4 labels 259defgetP4Labels(depotPaths): 260 labels =set() 261ifisinstance(depotPaths,basestring): 262 depotPaths = [depotPaths] 263 264for l inp4CmdList(["labels"] + ["%s..."% p for p in depotPaths]): 265 label = l['label'] 266 labels.add(label) 267 268return labels 269 270# Return the set of all git tags 271defgetGitTags(): 272 gitTags =set() 273for line inread_pipe_lines(["git","tag"]): 274 tag = line.strip() 275 gitTags.add(tag) 276return gitTags 277 278defdiffTreePattern(): 279# This is a simple generator for the diff tree regex pattern. This could be 280# a class variable if this and parseDiffTreeEntry were a part of a class. 281 pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)') 282while True: 283yield pattern 284 285defparseDiffTreeEntry(entry): 286"""Parses a single diff tree entry into its component elements. 287 288 See git-diff-tree(1) manpage for details about the format of the diff 289 output. This method returns a dictionary with the following elements: 290 291 src_mode - The mode of the source file 292 dst_mode - The mode of the destination file 293 src_sha1 - The sha1 for the source file 294 dst_sha1 - The sha1 fr the destination file 295 status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc) 296 status_score - The score for the status (applicable for 'C' and 'R' 297 statuses). This is None if there is no score. 298 src - The path for the source file. 299 dst - The path for the destination file. This is only present for 300 copy or renames. If it is not present, this is None. 301 302 If the pattern is not matched, None is returned.""" 303 304 match =diffTreePattern().next().match(entry) 305if match: 306return{ 307'src_mode': match.group(1), 308'dst_mode': match.group(2), 309'src_sha1': match.group(3), 310'dst_sha1': match.group(4), 311'status': match.group(5), 312'status_score': match.group(6), 313'src': match.group(7), 314'dst': match.group(10) 315} 316return None 317 318defisModeExec(mode): 319# Returns True if the given git mode represents an executable file, 320# otherwise False. 321return mode[-3:] =="755" 322 323defisModeExecChanged(src_mode, dst_mode): 324returnisModeExec(src_mode) !=isModeExec(dst_mode) 325 326defp4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None): 327 328ifisinstance(cmd,basestring): 329 cmd ="-G "+ cmd 330 expand =True 331else: 332 cmd = ["-G"] + cmd 333 expand =False 334 335 cmd =p4_build_cmd(cmd) 336if verbose: 337 sys.stderr.write("Opening pipe:%s\n"%str(cmd)) 338 339# Use a temporary file to avoid deadlocks without 340# subprocess.communicate(), which would put another copy 341# of stdout into memory. 342 stdin_file =None 343if stdin is not None: 344 stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode) 345ifisinstance(stdin,basestring): 346 stdin_file.write(stdin) 347else: 348for i in stdin: 349 stdin_file.write(i +'\n') 350 stdin_file.flush() 351 stdin_file.seek(0) 352 353 p4 = subprocess.Popen(cmd, 354 shell=expand, 355 stdin=stdin_file, 356 stdout=subprocess.PIPE) 357 358 result = [] 359try: 360while True: 361 entry = marshal.load(p4.stdout) 362if cb is not None: 363cb(entry) 364else: 365 result.append(entry) 366exceptEOFError: 367pass 368 exitCode = p4.wait() 369if exitCode !=0: 370 entry = {} 371 entry["p4ExitCode"] = exitCode 372 result.append(entry) 373 374return result 375 376defp4Cmd(cmd): 377list=p4CmdList(cmd) 378 result = {} 379for entry inlist: 380 result.update(entry) 381return result; 382 383defp4Where(depotPath): 384if not depotPath.endswith("/"): 385 depotPath +="/" 386 depotPath = depotPath +"..." 387 outputList =p4CmdList(["where", depotPath]) 388 output =None 389for entry in outputList: 390if"depotFile"in entry: 391if entry["depotFile"] == depotPath: 392 output = entry 393break 394elif"data"in entry: 395 data = entry.get("data") 396 space = data.find(" ") 397if data[:space] == depotPath: 398 output = entry 399break 400if output ==None: 401return"" 402if output["code"] =="error": 403return"" 404 clientPath ="" 405if"path"in output: 406 clientPath = output.get("path") 407elif"data"in output: 408 data = output.get("data") 409 lastSpace = data.rfind(" ") 410 clientPath = data[lastSpace +1:] 411 412if clientPath.endswith("..."): 413 clientPath = clientPath[:-3] 414return clientPath 415 416defcurrentGitBranch(): 417returnread_pipe("git name-rev HEAD").split(" ")[1].strip() 418 419defisValidGitDir(path): 420if(os.path.exists(path +"/HEAD") 421and os.path.exists(path +"/refs")and os.path.exists(path +"/objects")): 422return True; 423return False 424 425defparseRevision(ref): 426returnread_pipe("git rev-parse%s"% ref).strip() 427 428defbranchExists(ref): 429 rev =read_pipe(["git","rev-parse","-q","--verify", ref], 430 ignore_error=True) 431returnlen(rev) >0 432 433defextractLogMessageFromGitCommit(commit): 434 logMessage ="" 435 436## fixme: title is first line of commit, not 1st paragraph. 437 foundTitle =False 438for log inread_pipe_lines("git cat-file commit%s"% commit): 439if not foundTitle: 440iflen(log) ==1: 441 foundTitle =True 442continue 443 444 logMessage += log 445return logMessage 446 447defextractSettingsGitLog(log): 448 values = {} 449for line in log.split("\n"): 450 line = line.strip() 451 m = re.search(r"^ *\[git-p4: (.*)\]$", line) 452if not m: 453continue 454 455 assignments = m.group(1).split(':') 456for a in assignments: 457 vals = a.split('=') 458 key = vals[0].strip() 459 val = ('='.join(vals[1:])).strip() 460if val.endswith('\"')and val.startswith('"'): 461 val = val[1:-1] 462 463 values[key] = val 464 465 paths = values.get("depot-paths") 466if not paths: 467 paths = values.get("depot-path") 468if paths: 469 values['depot-paths'] = paths.split(',') 470return values 471 472defgitBranchExists(branch): 473 proc = subprocess.Popen(["git","rev-parse", branch], 474 stderr=subprocess.PIPE, stdout=subprocess.PIPE); 475return proc.wait() ==0; 476 477_gitConfig = {} 478defgitConfig(key, args =None):# set args to "--bool", for instance 479if not _gitConfig.has_key(key): 480 argsFilter ="" 481if args !=None: 482 argsFilter ="%s"% args 483 cmd ="git config%s%s"% (argsFilter, key) 484 _gitConfig[key] =read_pipe(cmd, ignore_error=True).strip() 485return _gitConfig[key] 486 487defgitConfigList(key): 488if not _gitConfig.has_key(key): 489 _gitConfig[key] =read_pipe("git config --get-all%s"% key, ignore_error=True).strip().split(os.linesep) 490return _gitConfig[key] 491 492defp4BranchesInGit(branchesAreInRemotes =True): 493 branches = {} 494 495 cmdline ="git rev-parse --symbolic " 496if branchesAreInRemotes: 497 cmdline +=" --remotes" 498else: 499 cmdline +=" --branches" 500 501for line inread_pipe_lines(cmdline): 502 line = line.strip() 503 504## only import to p4/ 505if not line.startswith('p4/')or line =="p4/HEAD": 506continue 507 branch = line 508 509# strip off p4 510 branch = re.sub("^p4/","", line) 511 512 branches[branch] =parseRevision(line) 513return branches 514 515deffindUpstreamBranchPoint(head ="HEAD"): 516 branches =p4BranchesInGit() 517# map from depot-path to branch name 518 branchByDepotPath = {} 519for branch in branches.keys(): 520 tip = branches[branch] 521 log =extractLogMessageFromGitCommit(tip) 522 settings =extractSettingsGitLog(log) 523if settings.has_key("depot-paths"): 524 paths =",".join(settings["depot-paths"]) 525 branchByDepotPath[paths] ="remotes/p4/"+ branch 526 527 settings =None 528 parent =0 529while parent <65535: 530 commit = head +"~%s"% parent 531 log =extractLogMessageFromGitCommit(commit) 532 settings =extractSettingsGitLog(log) 533if settings.has_key("depot-paths"): 534 paths =",".join(settings["depot-paths"]) 535if branchByDepotPath.has_key(paths): 536return[branchByDepotPath[paths], settings] 537 538 parent = parent +1 539 540return["", settings] 541 542defcreateOrUpdateBranchesFromOrigin(localRefPrefix ="refs/remotes/p4/", silent=True): 543if not silent: 544print("Creating/updating branch(es) in%sbased on origin branch(es)" 545% localRefPrefix) 546 547 originPrefix ="origin/p4/" 548 549for line inread_pipe_lines("git rev-parse --symbolic --remotes"): 550 line = line.strip() 551if(not line.startswith(originPrefix))or line.endswith("HEAD"): 552continue 553 554 headName = line[len(originPrefix):] 555 remoteHead = localRefPrefix + headName 556 originHead = line 557 558 original =extractSettingsGitLog(extractLogMessageFromGitCommit(originHead)) 559if(not original.has_key('depot-paths') 560or not original.has_key('change')): 561continue 562 563 update =False 564if notgitBranchExists(remoteHead): 565if verbose: 566print"creating%s"% remoteHead 567 update =True 568else: 569 settings =extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead)) 570if settings.has_key('change') >0: 571if settings['depot-paths'] == original['depot-paths']: 572 originP4Change =int(original['change']) 573 p4Change =int(settings['change']) 574if originP4Change > p4Change: 575print("%s(%s) is newer than%s(%s). " 576"Updating p4 branch from origin." 577% (originHead, originP4Change, 578 remoteHead, p4Change)) 579 update =True 580else: 581print("Ignoring:%swas imported from%swhile " 582"%swas imported from%s" 583% (originHead,','.join(original['depot-paths']), 584 remoteHead,','.join(settings['depot-paths']))) 585 586if update: 587system("git update-ref%s %s"% (remoteHead, originHead)) 588 589deforiginP4BranchesExist(): 590returngitBranchExists("origin")orgitBranchExists("origin/p4")orgitBranchExists("origin/p4/master") 591 592defp4ChangesForPaths(depotPaths, changeRange): 593assert depotPaths 594 cmd = ['changes'] 595for p in depotPaths: 596 cmd += ["%s...%s"% (p, changeRange)] 597 output =p4_read_pipe_lines(cmd) 598 599 changes = {} 600for line in output: 601 changeNum =int(line.split(" ")[1]) 602 changes[changeNum] =True 603 604 changelist = changes.keys() 605 changelist.sort() 606return changelist 607 608defp4PathStartsWith(path, prefix): 609# This method tries to remedy a potential mixed-case issue: 610# 611# If UserA adds //depot/DirA/file1 612# and UserB adds //depot/dira/file2 613# 614# we may or may not have a problem. If you have core.ignorecase=true, 615# we treat DirA and dira as the same directory 616 ignorecase =gitConfig("core.ignorecase","--bool") =="true" 617if ignorecase: 618return path.lower().startswith(prefix.lower()) 619return path.startswith(prefix) 620 621defgetClientSpec(): 622"""Look at the p4 client spec, create a View() object that contains 623 all the mappings, and return it.""" 624 625 specList =p4CmdList("client -o") 626iflen(specList) !=1: 627die('Output from "client -o" is%dlines, expecting 1'% 628len(specList)) 629 630# dictionary of all client parameters 631 entry = specList[0] 632 633# just the keys that start with "View" 634 view_keys = [ k for k in entry.keys()if k.startswith("View") ] 635 636# hold this new View 637 view =View() 638 639# append the lines, in order, to the view 640for view_num inrange(len(view_keys)): 641 k ="View%d"% view_num 642if k not in view_keys: 643die("Expected view key%smissing"% k) 644 view.append(entry[k]) 645 646return view 647 648defgetClientRoot(): 649"""Grab the client directory.""" 650 651 output =p4CmdList("client -o") 652iflen(output) !=1: 653die('Output from "client -o" is%dlines, expecting 1'%len(output)) 654 655 entry = output[0] 656if"Root"not in entry: 657die('Client has no "Root"') 658 659return entry["Root"] 660 661class Command: 662def__init__(self): 663 self.usage ="usage: %prog [options]" 664 self.needsGit =True 665 self.verbose =False 666 667class P4UserMap: 668def__init__(self): 669 self.userMapFromPerforceServer =False 670 self.myP4UserId =None 671 672defp4UserId(self): 673if self.myP4UserId: 674return self.myP4UserId 675 676 results =p4CmdList("user -o") 677for r in results: 678if r.has_key('User'): 679 self.myP4UserId = r['User'] 680return r['User'] 681die("Could not find your p4 user id") 682 683defp4UserIsMe(self, p4User): 684# return True if the given p4 user is actually me 685 me = self.p4UserId() 686if not p4User or p4User != me: 687return False 688else: 689return True 690 691defgetUserCacheFilename(self): 692 home = os.environ.get("HOME", os.environ.get("USERPROFILE")) 693return home +"/.gitp4-usercache.txt" 694 695defgetUserMapFromPerforceServer(self): 696if self.userMapFromPerforceServer: 697return 698 self.users = {} 699 self.emails = {} 700 701for output inp4CmdList("users"): 702if not output.has_key("User"): 703continue 704 self.users[output["User"]] = output["FullName"] +" <"+ output["Email"] +">" 705 self.emails[output["Email"]] = output["User"] 706 707 708 s ='' 709for(key, val)in self.users.items(): 710 s +="%s\t%s\n"% (key.expandtabs(1), val.expandtabs(1)) 711 712open(self.getUserCacheFilename(),"wb").write(s) 713 self.userMapFromPerforceServer =True 714 715defloadUserMapFromCache(self): 716 self.users = {} 717 self.userMapFromPerforceServer =False 718try: 719 cache =open(self.getUserCacheFilename(),"rb") 720 lines = cache.readlines() 721 cache.close() 722for line in lines: 723 entry = line.strip().split("\t") 724 self.users[entry[0]] = entry[1] 725exceptIOError: 726 self.getUserMapFromPerforceServer() 727 728classP4Debug(Command): 729def__init__(self): 730 Command.__init__(self) 731 self.options = [] 732 self.description ="A tool to debug the output of p4 -G." 733 self.needsGit =False 734 735defrun(self, args): 736 j =0 737for output inp4CmdList(args): 738print'Element:%d'% j 739 j +=1 740print output 741return True 742 743classP4RollBack(Command): 744def__init__(self): 745 Command.__init__(self) 746 self.options = [ 747 optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true") 748] 749 self.description ="A tool to debug the multi-branch import. Don't use :)" 750 self.rollbackLocalBranches =False 751 752defrun(self, args): 753iflen(args) !=1: 754return False 755 maxChange =int(args[0]) 756 757if"p4ExitCode"inp4Cmd("changes -m 1"): 758die("Problems executing p4"); 759 760if self.rollbackLocalBranches: 761 refPrefix ="refs/heads/" 762 lines =read_pipe_lines("git rev-parse --symbolic --branches") 763else: 764 refPrefix ="refs/remotes/" 765 lines =read_pipe_lines("git rev-parse --symbolic --remotes") 766 767for line in lines: 768if self.rollbackLocalBranches or(line.startswith("p4/")and line !="p4/HEAD\n"): 769 line = line.strip() 770 ref = refPrefix + line 771 log =extractLogMessageFromGitCommit(ref) 772 settings =extractSettingsGitLog(log) 773 774 depotPaths = settings['depot-paths'] 775 change = settings['change'] 776 777 changed =False 778 779iflen(p4Cmd("changes -m 1 "+' '.join(['%s...@%s'% (p, maxChange) 780for p in depotPaths]))) ==0: 781print"Branch%sdid not exist at change%s, deleting."% (ref, maxChange) 782system("git update-ref -d%s`git rev-parse%s`"% (ref, ref)) 783continue 784 785while change andint(change) > maxChange: 786 changed =True 787if self.verbose: 788print"%sis at%s; rewinding towards%s"% (ref, change, maxChange) 789system("git update-ref%s\"%s^\""% (ref, ref)) 790 log =extractLogMessageFromGitCommit(ref) 791 settings =extractSettingsGitLog(log) 792 793 794 depotPaths = settings['depot-paths'] 795 change = settings['change'] 796 797if changed: 798print"%srewound to%s"% (ref, change) 799 800return True 801 802classP4Submit(Command, P4UserMap): 803def__init__(self): 804 Command.__init__(self) 805 P4UserMap.__init__(self) 806 self.options = [ 807 optparse.make_option("--origin", dest="origin"), 808 optparse.make_option("-M", dest="detectRenames", action="store_true"), 809# preserve the user, requires relevant p4 permissions 810 optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"), 811 optparse.make_option("--export-labels", dest="exportLabels", action="store_true"), 812] 813 self.description ="Submit changes from git to the perforce depot." 814 self.usage +=" [name of git branch to submit into perforce depot]" 815 self.interactive =True 816 self.origin ="" 817 self.detectRenames =False 818 self.preserveUser =gitConfig("git-p4.preserveUser").lower() =="true" 819 self.isWindows = (platform.system() =="Windows") 820 self.exportLabels =False 821 822defcheck(self): 823iflen(p4CmdList("opened ...")) >0: 824die("You have files opened with perforce! Close them before starting the sync.") 825 826# replaces everything between 'Description:' and the next P4 submit template field with the 827# commit message 828defprepareLogMessage(self, template, message): 829 result ="" 830 831 inDescriptionSection =False 832 833for line in template.split("\n"): 834if line.startswith("#"): 835 result += line +"\n" 836continue 837 838if inDescriptionSection: 839if line.startswith("Files:")or line.startswith("Jobs:"): 840 inDescriptionSection =False 841else: 842continue 843else: 844if line.startswith("Description:"): 845 inDescriptionSection =True 846 line +="\n" 847for messageLine in message.split("\n"): 848 line +="\t"+ messageLine +"\n" 849 850 result += line +"\n" 851 852return result 853 854defpatchRCSKeywords(self,file, pattern): 855# Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern 856(handle, outFileName) = tempfile.mkstemp(dir='.') 857try: 858 outFile = os.fdopen(handle,"w+") 859 inFile =open(file,"r") 860 regexp = re.compile(pattern, re.VERBOSE) 861for line in inFile.readlines(): 862 line = regexp.sub(r'$\1$', line) 863 outFile.write(line) 864 inFile.close() 865 outFile.close() 866# Forcibly overwrite the original file 867 os.unlink(file) 868 shutil.move(outFileName,file) 869except: 870# cleanup our temporary file 871 os.unlink(outFileName) 872print"Failed to strip RCS keywords in%s"%file 873raise 874 875print"Patched up RCS keywords in%s"%file 876 877defp4UserForCommit(self,id): 878# Return the tuple (perforce user,git email) for a given git commit id 879 self.getUserMapFromPerforceServer() 880 gitEmail =read_pipe("git log --max-count=1 --format='%%ae'%s"%id) 881 gitEmail = gitEmail.strip() 882if not self.emails.has_key(gitEmail): 883return(None,gitEmail) 884else: 885return(self.emails[gitEmail],gitEmail) 886 887defcheckValidP4Users(self,commits): 888# check if any git authors cannot be mapped to p4 users 889foridin commits: 890(user,email) = self.p4UserForCommit(id) 891if not user: 892 msg ="Cannot find p4 user for email%sin commit%s."% (email,id) 893ifgitConfig('git-p4.allowMissingP4Users').lower() =="true": 894print"%s"% msg 895else: 896die("Error:%s\nSet git-p4.allowMissingP4Users to true to allow this."% msg) 897 898deflastP4Changelist(self): 899# Get back the last changelist number submitted in this client spec. This 900# then gets used to patch up the username in the change. If the same 901# client spec is being used by multiple processes then this might go 902# wrong. 903 results =p4CmdList("client -o")# find the current client 904 client =None 905for r in results: 906if r.has_key('Client'): 907 client = r['Client'] 908break 909if not client: 910die("could not get client spec") 911 results =p4CmdList(["changes","-c", client,"-m","1"]) 912for r in results: 913if r.has_key('change'): 914return r['change'] 915die("Could not get changelist number for last submit - cannot patch up user details") 916 917defmodifyChangelistUser(self, changelist, newUser): 918# fixup the user field of a changelist after it has been submitted. 919 changes =p4CmdList("change -o%s"% changelist) 920iflen(changes) !=1: 921die("Bad output from p4 change modifying%sto user%s"% 922(changelist, newUser)) 923 924 c = changes[0] 925if c['User'] == newUser:return# nothing to do 926 c['User'] = newUser 927input= marshal.dumps(c) 928 929 result =p4CmdList("change -f -i", stdin=input) 930for r in result: 931if r.has_key('code'): 932if r['code'] =='error': 933die("Could not modify user field of changelist%sto%s:%s"% (changelist, newUser, r['data'])) 934if r.has_key('data'): 935print("Updated user field for changelist%sto%s"% (changelist, newUser)) 936return 937die("Could not modify user field of changelist%sto%s"% (changelist, newUser)) 938 939defcanChangeChangelists(self): 940# check to see if we have p4 admin or super-user permissions, either of 941# which are required to modify changelists. 942 results =p4CmdList(["protects", self.depotPath]) 943for r in results: 944if r.has_key('perm'): 945if r['perm'] =='admin': 946return1 947if r['perm'] =='super': 948return1 949return0 950 951defprepareSubmitTemplate(self): 952# remove lines in the Files section that show changes to files outside the depot path we're committing into 953 template ="" 954 inFilesSection =False 955for line inp4_read_pipe_lines(['change','-o']): 956if line.endswith("\r\n"): 957 line = line[:-2] +"\n" 958if inFilesSection: 959if line.startswith("\t"): 960# path starts and ends with a tab 961 path = line[1:] 962 lastTab = path.rfind("\t") 963if lastTab != -1: 964 path = path[:lastTab] 965if notp4PathStartsWith(path, self.depotPath): 966continue 967else: 968 inFilesSection =False 969else: 970if line.startswith("Files:"): 971 inFilesSection =True 972 973 template += line 974 975return template 976 977defedit_template(self, template_file): 978"""Invoke the editor to let the user change the submission 979 message. Return true if okay to continue with the submit.""" 980 981# if configured to skip the editing part, just submit 982ifgitConfig("git-p4.skipSubmitEdit") =="true": 983return True 984 985# look at the modification time, to check later if the user saved 986# the file 987 mtime = os.stat(template_file).st_mtime 988 989# invoke the editor 990if os.environ.has_key("P4EDITOR")and(os.environ.get("P4EDITOR") !=""): 991 editor = os.environ.get("P4EDITOR") 992else: 993 editor =read_pipe("git var GIT_EDITOR").strip() 994system(editor +" "+ template_file) 995 996# If the file was not saved, prompt to see if this patch should 997# be skipped. But skip this verification step if configured so. 998ifgitConfig("git-p4.skipSubmitEditCheck") =="true": 999return True10001001# modification time updated means user saved the file1002if os.stat(template_file).st_mtime > mtime:1003return True10041005while True:1006 response =raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")1007if response =='y':1008return True1009if response =='n':1010return False10111012defapplyCommit(self,id):1013print"Applying%s"% (read_pipe("git log --max-count=1 --pretty=oneline%s"%id))10141015(p4User, gitEmail) = self.p4UserForCommit(id)10161017if not self.detectRenames:1018# If not explicitly set check the config variable1019 self.detectRenames =gitConfig("git-p4.detectRenames")10201021if self.detectRenames.lower() =="false"or self.detectRenames =="":1022 diffOpts =""1023elif self.detectRenames.lower() =="true":1024 diffOpts ="-M"1025else:1026 diffOpts ="-M%s"% self.detectRenames10271028 detectCopies =gitConfig("git-p4.detectCopies")1029if detectCopies.lower() =="true":1030 diffOpts +=" -C"1031elif detectCopies !=""and detectCopies.lower() !="false":1032 diffOpts +=" -C%s"% detectCopies10331034ifgitConfig("git-p4.detectCopiesHarder","--bool") =="true":1035 diffOpts +=" --find-copies-harder"10361037 diff =read_pipe_lines("git diff-tree -r%s\"%s^\" \"%s\""% (diffOpts,id,id))1038 filesToAdd =set()1039 filesToDelete =set()1040 editedFiles =set()1041 filesToChangeExecBit = {}10421043for line in diff:1044 diff =parseDiffTreeEntry(line)1045 modifier = diff['status']1046 path = diff['src']1047if modifier =="M":1048p4_edit(path)1049ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1050 filesToChangeExecBit[path] = diff['dst_mode']1051 editedFiles.add(path)1052elif modifier =="A":1053 filesToAdd.add(path)1054 filesToChangeExecBit[path] = diff['dst_mode']1055if path in filesToDelete:1056 filesToDelete.remove(path)1057elif modifier =="D":1058 filesToDelete.add(path)1059if path in filesToAdd:1060 filesToAdd.remove(path)1061elif modifier =="C":1062 src, dest = diff['src'], diff['dst']1063p4_integrate(src, dest)1064if diff['src_sha1'] != diff['dst_sha1']:1065p4_edit(dest)1066ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1067p4_edit(dest)1068 filesToChangeExecBit[dest] = diff['dst_mode']1069 os.unlink(dest)1070 editedFiles.add(dest)1071elif modifier =="R":1072 src, dest = diff['src'], diff['dst']1073p4_integrate(src, dest)1074if diff['src_sha1'] != diff['dst_sha1']:1075p4_edit(dest)1076ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1077p4_edit(dest)1078 filesToChangeExecBit[dest] = diff['dst_mode']1079 os.unlink(dest)1080 editedFiles.add(dest)1081 filesToDelete.add(src)1082else:1083die("unknown modifier%sfor%s"% (modifier, path))10841085 diffcmd ="git format-patch -k --stdout\"%s^\"..\"%s\""% (id,id)1086 patchcmd = diffcmd +" | git apply "1087 tryPatchCmd = patchcmd +"--check -"1088 applyPatchCmd = patchcmd +"--check --apply -"1089 patch_succeeded =True10901091if os.system(tryPatchCmd) !=0:1092 fixed_rcs_keywords =False1093 patch_succeeded =False1094print"Unfortunately applying the change failed!"10951096# Patch failed, maybe it's just RCS keyword woes. Look through1097# the patch to see if that's possible.1098ifgitConfig("git-p4.attemptRCSCleanup","--bool") =="true":1099file=None1100 pattern =None1101 kwfiles = {}1102forfilein editedFiles | filesToDelete:1103# did this file's delta contain RCS keywords?1104 pattern =p4_keywords_regexp_for_file(file)11051106if pattern:1107# this file is a possibility...look for RCS keywords.1108 regexp = re.compile(pattern, re.VERBOSE)1109for line inread_pipe_lines(["git","diff","%s^..%s"% (id,id),file]):1110if regexp.search(line):1111if verbose:1112print"got keyword match on%sin%sin%s"% (pattern, line,file)1113 kwfiles[file] = pattern1114break11151116forfilein kwfiles:1117if verbose:1118print"zapping%swith%s"% (line,pattern)1119 self.patchRCSKeywords(file, kwfiles[file])1120 fixed_rcs_keywords =True11211122if fixed_rcs_keywords:1123print"Retrying the patch with RCS keywords cleaned up"1124if os.system(tryPatchCmd) ==0:1125 patch_succeeded =True11261127if not patch_succeeded:1128print"What do you want to do?"1129 response ="x"1130while response !="s"and response !="a"and response !="w":1131 response =raw_input("[s]kip this patch / [a]pply the patch forcibly "1132"and with .rej files / [w]rite the patch to a file (patch.txt) ")1133if response =="s":1134print"Skipping! Good luck with the next patches..."1135for f in editedFiles:1136p4_revert(f)1137for f in filesToAdd:1138 os.remove(f)1139return1140elif response =="a":1141 os.system(applyPatchCmd)1142iflen(filesToAdd) >0:1143print"You may also want to call p4 add on the following files:"1144print" ".join(filesToAdd)1145iflen(filesToDelete):1146print"The following files should be scheduled for deletion with p4 delete:"1147print" ".join(filesToDelete)1148die("Please resolve and submit the conflict manually and "1149+"continue afterwards with git p4 submit --continue")1150elif response =="w":1151system(diffcmd +" > patch.txt")1152print"Patch saved to patch.txt in%s!"% self.clientPath1153die("Please resolve and submit the conflict manually and "1154"continue afterwards with git p4 submit --continue")11551156system(applyPatchCmd)11571158for f in filesToAdd:1159p4_add(f)1160for f in filesToDelete:1161p4_revert(f)1162p4_delete(f)11631164# Set/clear executable bits1165for f in filesToChangeExecBit.keys():1166 mode = filesToChangeExecBit[f]1167setP4ExecBit(f, mode)11681169 logMessage =extractLogMessageFromGitCommit(id)1170 logMessage = logMessage.strip()11711172 template = self.prepareSubmitTemplate()11731174if self.interactive:1175 submitTemplate = self.prepareLogMessage(template, logMessage)11761177if self.preserveUser:1178 submitTemplate = submitTemplate + ("\n######## Actual user%s, modified after commit\n"% p4User)11791180if os.environ.has_key("P4DIFF"):1181del(os.environ["P4DIFF"])1182 diff =""1183for editedFile in editedFiles:1184 diff +=p4_read_pipe(['diff','-du', editedFile])11851186 newdiff =""1187for newFile in filesToAdd:1188 newdiff +="==== new file ====\n"1189 newdiff +="--- /dev/null\n"1190 newdiff +="+++%s\n"% newFile1191 f =open(newFile,"r")1192for line in f.readlines():1193 newdiff +="+"+ line1194 f.close()11951196if self.checkAuthorship and not self.p4UserIsMe(p4User):1197 submitTemplate +="######## git author%sdoes not match your p4 account.\n"% gitEmail1198 submitTemplate +="######## Use option --preserve-user to modify authorship.\n"1199 submitTemplate +="######## Variable git-p4.skipUserNameCheck hides this message.\n"12001201 separatorLine ="######## everything below this line is just the diff #######\n"12021203(handle, fileName) = tempfile.mkstemp()1204 tmpFile = os.fdopen(handle,"w+")1205if self.isWindows:1206 submitTemplate = submitTemplate.replace("\n","\r\n")1207 separatorLine = separatorLine.replace("\n","\r\n")1208 newdiff = newdiff.replace("\n","\r\n")1209 tmpFile.write(submitTemplate + separatorLine + diff + newdiff)1210 tmpFile.close()12111212if self.edit_template(fileName):1213# read the edited message and submit1214 tmpFile =open(fileName,"rb")1215 message = tmpFile.read()1216 tmpFile.close()1217 submitTemplate = message[:message.index(separatorLine)]1218if self.isWindows:1219 submitTemplate = submitTemplate.replace("\r\n","\n")1220p4_write_pipe(['submit','-i'], submitTemplate)12211222if self.preserveUser:1223if p4User:1224# Get last changelist number. Cannot easily get it from1225# the submit command output as the output is1226# unmarshalled.1227 changelist = self.lastP4Changelist()1228 self.modifyChangelistUser(changelist, p4User)1229else:1230# skip this patch1231print"Submission cancelled, undoing p4 changes."1232for f in editedFiles:1233p4_revert(f)1234for f in filesToAdd:1235p4_revert(f)1236 os.remove(f)12371238 os.remove(fileName)1239else:1240 fileName ="submit.txt"1241file=open(fileName,"w+")1242file.write(self.prepareLogMessage(template, logMessage))1243file.close()1244print("Perforce submit template written as%s. "1245+"Please review/edit and then use p4 submit -i <%sto submit directly!"1246% (fileName, fileName))12471248# Export git tags as p4 labels. Create a p4 label and then tag1249# with that.1250defexportGitTags(self, gitTags):1251 validLabelRegexp =gitConfig("git-p4.labelExportRegexp")1252iflen(validLabelRegexp) ==0:1253 validLabelRegexp = defaultLabelRegexp1254 m = re.compile(validLabelRegexp)12551256for name in gitTags:12571258if not m.match(name):1259if verbose:1260print"tag%sdoes not match regexp%s"% (name, validTagRegexp)1261continue12621263# Get the p4 commit this corresponds to1264 logMessage =extractLogMessageFromGitCommit(name)1265 values =extractSettingsGitLog(logMessage)12661267if not values.has_key('change'):1268# a tag pointing to something not sent to p4; ignore1269if verbose:1270print"git tag%sdoes not give a p4 commit"% name1271continue1272else:1273 changelist = values['change']12741275# Get the tag details.1276 inHeader =True1277 isAnnotated =False1278 body = []1279for l inread_pipe_lines(["git","cat-file","-p", name]):1280 l = l.strip()1281if inHeader:1282if re.match(r'tag\s+', l):1283 isAnnotated =True1284elif re.match(r'\s*$', l):1285 inHeader =False1286continue1287else:1288 body.append(l)12891290if not isAnnotated:1291 body = ["lightweight tag imported by git p4\n"]12921293# Create the label - use the same view as the client spec we are using1294 clientSpec =getClientSpec()12951296 labelTemplate ="Label:%s\n"% name1297 labelTemplate +="Description:\n"1298for b in body:1299 labelTemplate +="\t"+ b +"\n"1300 labelTemplate +="View:\n"1301for mapping in clientSpec.mappings:1302 labelTemplate +="\t%s\n"% mapping.depot_side.path13031304p4_write_pipe(["label","-i"], labelTemplate)13051306# Use the label1307p4_system(["tag","-l", name] +1308["%s@%s"% (mapping.depot_side.path, changelist)for mapping in clientSpec.mappings])13091310if verbose:1311print"created p4 label for tag%s"% name13121313defrun(self, args):1314iflen(args) ==0:1315 self.master =currentGitBranch()1316iflen(self.master) ==0or notgitBranchExists("refs/heads/%s"% self.master):1317die("Detecting current git branch failed!")1318eliflen(args) ==1:1319 self.master = args[0]1320if notbranchExists(self.master):1321die("Branch%sdoes not exist"% self.master)1322else:1323return False13241325 allowSubmit =gitConfig("git-p4.allowSubmit")1326iflen(allowSubmit) >0and not self.master in allowSubmit.split(","):1327die("%sis not in git-p4.allowSubmit"% self.master)13281329[upstream, settings] =findUpstreamBranchPoint()1330 self.depotPath = settings['depot-paths'][0]1331iflen(self.origin) ==0:1332 self.origin = upstream13331334if self.preserveUser:1335if not self.canChangeChangelists():1336die("Cannot preserve user names without p4 super-user or admin permissions")13371338if self.verbose:1339print"Origin branch is "+ self.origin13401341iflen(self.depotPath) ==0:1342print"Internal error: cannot locate perforce depot path from existing branches"1343 sys.exit(128)13441345 self.useClientSpec =False1346ifgitConfig("git-p4.useclientspec","--bool") =="true":1347 self.useClientSpec =True1348if self.useClientSpec:1349 self.clientSpecDirs =getClientSpec()13501351if self.useClientSpec:1352# all files are relative to the client spec1353 self.clientPath =getClientRoot()1354else:1355 self.clientPath =p4Where(self.depotPath)13561357if self.clientPath =="":1358die("Error: Cannot locate perforce checkout of%sin client view"% self.depotPath)13591360print"Perforce checkout for depot path%slocated at%s"% (self.depotPath, self.clientPath)1361 self.oldWorkingDirectory = os.getcwd()13621363# ensure the clientPath exists1364 new_client_dir =False1365if not os.path.exists(self.clientPath):1366 new_client_dir =True1367 os.makedirs(self.clientPath)13681369chdir(self.clientPath)1370print"Synchronizing p4 checkout..."1371if new_client_dir:1372# old one was destroyed, and maybe nobody told p41373p4_sync("...","-f")1374else:1375p4_sync("...")1376 self.check()13771378 commits = []1379for line inread_pipe_lines("git rev-list --no-merges%s..%s"% (self.origin, self.master)):1380 commits.append(line.strip())1381 commits.reverse()13821383if self.preserveUser or(gitConfig("git-p4.skipUserNameCheck") =="true"):1384 self.checkAuthorship =False1385else:1386 self.checkAuthorship =True13871388if self.preserveUser:1389 self.checkValidP4Users(commits)13901391whilelen(commits) >0:1392 commit = commits[0]1393 commits = commits[1:]1394 self.applyCommit(commit)1395if not self.interactive:1396break13971398iflen(commits) ==0:1399print"All changes applied!"1400chdir(self.oldWorkingDirectory)14011402 sync =P4Sync()1403 sync.run([])14041405 rebase =P4Rebase()1406 rebase.rebase()14071408ifgitConfig("git-p4.exportLabels","--bool") =="true":1409 self.exportLabels = true14101411if self.exportLabels:1412 p4Labels =getP4Labels(self.depotPath)1413 gitTags =getGitTags()14141415 missingGitTags = gitTags - p4Labels1416 self.exportGitTags(missingGitTags)14171418return True14191420classView(object):1421"""Represent a p4 view ("p4 help views"), and map files in a1422 repo according to the view."""14231424classPath(object):1425"""A depot or client path, possibly containing wildcards.1426 The only one supported is ... at the end, currently.1427 Initialize with the full path, with //depot or //client."""14281429def__init__(self, path, is_depot):1430 self.path = path1431 self.is_depot = is_depot1432 self.find_wildcards()1433# remember the prefix bit, useful for relative mappings1434 m = re.match("(//[^/]+/)", self.path)1435if not m:1436die("Path%sdoes not start with //prefix/"% self.path)1437 prefix = m.group(1)1438if not self.is_depot:1439# strip //client/ on client paths1440 self.path = self.path[len(prefix):]14411442deffind_wildcards(self):1443"""Make sure wildcards are valid, and set up internal1444 variables."""14451446 self.ends_triple_dot =False1447# There are three wildcards allowed in p4 views1448# (see "p4 help views"). This code knows how to1449# handle "..." (only at the end), but cannot deal with1450# "%%n" or "*". Only check the depot_side, as p4 should1451# validate that the client_side matches too.1452if re.search(r'%%[1-9]', self.path):1453die("Can't handle%%n wildcards in view:%s"% self.path)1454if self.path.find("*") >=0:1455die("Can't handle * wildcards in view:%s"% self.path)1456 triple_dot_index = self.path.find("...")1457if triple_dot_index >=0:1458if triple_dot_index !=len(self.path) -3:1459die("Can handle only single ... wildcard, at end:%s"%1460 self.path)1461 self.ends_triple_dot =True14621463defensure_compatible(self, other_path):1464"""Make sure the wildcards agree."""1465if self.ends_triple_dot != other_path.ends_triple_dot:1466die("Both paths must end with ... if either does;\n"+1467"paths:%s %s"% (self.path, other_path.path))14681469defmatch_wildcards(self, test_path):1470"""See if this test_path matches us, and fill in the value1471 of the wildcards if so. Returns a tuple of1472 (True|False, wildcards[]). For now, only the ... at end1473 is supported, so at most one wildcard."""1474if self.ends_triple_dot:1475 dotless = self.path[:-3]1476if test_path.startswith(dotless):1477 wildcard = test_path[len(dotless):]1478return(True, [ wildcard ])1479else:1480if test_path == self.path:1481return(True, [])1482return(False, [])14831484defmatch(self, test_path):1485"""Just return if it matches; don't bother with the wildcards."""1486 b, _ = self.match_wildcards(test_path)1487return b14881489deffill_in_wildcards(self, wildcards):1490"""Return the relative path, with the wildcards filled in1491 if there are any."""1492if self.ends_triple_dot:1493return self.path[:-3] + wildcards[0]1494else:1495return self.path14961497classMapping(object):1498def__init__(self, depot_side, client_side, overlay, exclude):1499# depot_side is without the trailing /... if it had one1500 self.depot_side = View.Path(depot_side, is_depot=True)1501 self.client_side = View.Path(client_side, is_depot=False)1502 self.overlay = overlay # started with "+"1503 self.exclude = exclude # started with "-"1504assert not(self.overlay and self.exclude)1505 self.depot_side.ensure_compatible(self.client_side)15061507def__str__(self):1508 c =" "1509if self.overlay:1510 c ="+"1511if self.exclude:1512 c ="-"1513return"View.Mapping:%s%s->%s"% \1514(c, self.depot_side.path, self.client_side.path)15151516defmap_depot_to_client(self, depot_path):1517"""Calculate the client path if using this mapping on the1518 given depot path; does not consider the effect of other1519 mappings in a view. Even excluded mappings are returned."""1520 matches, wildcards = self.depot_side.match_wildcards(depot_path)1521if not matches:1522return""1523 client_path = self.client_side.fill_in_wildcards(wildcards)1524return client_path15251526#1527# View methods1528#1529def__init__(self):1530 self.mappings = []15311532defappend(self, view_line):1533"""Parse a view line, splitting it into depot and client1534 sides. Append to self.mappings, preserving order."""15351536# Split the view line into exactly two words. P4 enforces1537# structure on these lines that simplifies this quite a bit.1538#1539# Either or both words may be double-quoted.1540# Single quotes do not matter.1541# Double-quote marks cannot occur inside the words.1542# A + or - prefix is also inside the quotes.1543# There are no quotes unless they contain a space.1544# The line is already white-space stripped.1545# The two words are separated by a single space.1546#1547if view_line[0] =='"':1548# First word is double quoted. Find its end.1549 close_quote_index = view_line.find('"',1)1550if close_quote_index <=0:1551die("No first-word closing quote found:%s"% view_line)1552 depot_side = view_line[1:close_quote_index]1553# skip closing quote and space1554 rhs_index = close_quote_index +1+11555else:1556 space_index = view_line.find(" ")1557if space_index <=0:1558die("No word-splitting space found:%s"% view_line)1559 depot_side = view_line[0:space_index]1560 rhs_index = space_index +115611562if view_line[rhs_index] =='"':1563# Second word is double quoted. Make sure there is a1564# double quote at the end too.1565if not view_line.endswith('"'):1566die("View line with rhs quote should end with one:%s"%1567 view_line)1568# skip the quotes1569 client_side = view_line[rhs_index+1:-1]1570else:1571 client_side = view_line[rhs_index:]15721573# prefix + means overlay on previous mapping1574 overlay =False1575if depot_side.startswith("+"):1576 overlay =True1577 depot_side = depot_side[1:]15781579# prefix - means exclude this path1580 exclude =False1581if depot_side.startswith("-"):1582 exclude =True1583 depot_side = depot_side[1:]15841585 m = View.Mapping(depot_side, client_side, overlay, exclude)1586 self.mappings.append(m)15871588defmap_in_client(self, depot_path):1589"""Return the relative location in the client where this1590 depot file should live. Returns "" if the file should1591 not be mapped in the client."""15921593 paths_filled = []1594 client_path =""15951596# look at later entries first1597for m in self.mappings[::-1]:15981599# see where will this path end up in the client1600 p = m.map_depot_to_client(depot_path)16011602if p =="":1603# Depot path does not belong in client. Must remember1604# this, as previous items should not cause files to1605# exist in this path either. Remember that the list is1606# being walked from the end, which has higher precedence.1607# Overlap mappings do not exclude previous mappings.1608if not m.overlay:1609 paths_filled.append(m.client_side)16101611else:1612# This mapping matched; no need to search any further.1613# But, the mapping could be rejected if the client path1614# has already been claimed by an earlier mapping (i.e.1615# one later in the list, which we are walking backwards).1616 already_mapped_in_client =False1617for f in paths_filled:1618# this is View.Path.match1619if f.match(p):1620 already_mapped_in_client =True1621break1622if not already_mapped_in_client:1623# Include this file, unless it is from a line that1624# explicitly said to exclude it.1625if not m.exclude:1626 client_path = p16271628# a match, even if rejected, always stops the search1629break16301631return client_path16321633classP4Sync(Command, P4UserMap):1634 delete_actions = ("delete","move/delete","purge")16351636def__init__(self):1637 Command.__init__(self)1638 P4UserMap.__init__(self)1639 self.options = [1640 optparse.make_option("--branch", dest="branch"),1641 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),1642 optparse.make_option("--changesfile", dest="changesFile"),1643 optparse.make_option("--silent", dest="silent", action="store_true"),1644 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),1645 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),1646 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",1647help="Import into refs/heads/ , not refs/remotes"),1648 optparse.make_option("--max-changes", dest="maxChanges"),1649 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',1650help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),1651 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',1652help="Only sync files that are included in the Perforce Client Spec")1653]1654 self.description ="""Imports from Perforce into a git repository.\n1655 example:1656 //depot/my/project/ -- to import the current head1657 //depot/my/project/@all -- to import everything1658 //depot/my/project/@1,6 -- to import only from revision 1 to 616591660 (a ... is not needed in the path p4 specification, it's added implicitly)"""16611662 self.usage +=" //depot/path[@revRange]"1663 self.silent =False1664 self.createdBranches =set()1665 self.committedChanges =set()1666 self.branch =""1667 self.detectBranches =False1668 self.detectLabels =False1669 self.importLabels =False1670 self.changesFile =""1671 self.syncWithOrigin =True1672 self.importIntoRemotes =True1673 self.maxChanges =""1674 self.isWindows = (platform.system() =="Windows")1675 self.keepRepoPath =False1676 self.depotPaths =None1677 self.p4BranchesInGit = []1678 self.cloneExclude = []1679 self.useClientSpec =False1680 self.useClientSpec_from_options =False1681 self.clientSpecDirs =None1682 self.tempBranches = []1683 self.tempBranchLocation ="git-p4-tmp"16841685ifgitConfig("git-p4.syncFromOrigin") =="false":1686 self.syncWithOrigin =False16871688#1689# P4 wildcards are not allowed in filenames. P4 complains1690# if you simply add them, but you can force it with "-f", in1691# which case it translates them into %xx encoding internally.1692# Search for and fix just these four characters. Do % last so1693# that fixing it does not inadvertently create new %-escapes.1694#1695defwildcard_decode(self, path):1696# Cannot have * in a filename in windows; untested as to1697# what p4 would do in such a case.1698if not self.isWindows:1699 path = path.replace("%2A","*")1700 path = path.replace("%23","#") \1701.replace("%40","@") \1702.replace("%25","%")1703return path17041705# Force a checkpoint in fast-import and wait for it to finish1706defcheckpoint(self):1707 self.gitStream.write("checkpoint\n\n")1708 self.gitStream.write("progress checkpoint\n\n")1709 out = self.gitOutput.readline()1710if self.verbose:1711print"checkpoint finished: "+ out17121713defextractFilesFromCommit(self, commit):1714 self.cloneExclude = [re.sub(r"\.\.\.$","", path)1715for path in self.cloneExclude]1716 files = []1717 fnum =01718while commit.has_key("depotFile%s"% fnum):1719 path = commit["depotFile%s"% fnum]17201721if[p for p in self.cloneExclude1722ifp4PathStartsWith(path, p)]:1723 found =False1724else:1725 found = [p for p in self.depotPaths1726ifp4PathStartsWith(path, p)]1727if not found:1728 fnum = fnum +11729continue17301731file= {}1732file["path"] = path1733file["rev"] = commit["rev%s"% fnum]1734file["action"] = commit["action%s"% fnum]1735file["type"] = commit["type%s"% fnum]1736 files.append(file)1737 fnum = fnum +11738return files17391740defstripRepoPath(self, path, prefixes):1741if self.useClientSpec:1742return self.clientSpecDirs.map_in_client(path)17431744if self.keepRepoPath:1745 prefixes = [re.sub("^(//[^/]+/).*", r'\1', prefixes[0])]17461747for p in prefixes:1748ifp4PathStartsWith(path, p):1749 path = path[len(p):]17501751return path17521753defsplitFilesIntoBranches(self, commit):1754 branches = {}1755 fnum =01756while commit.has_key("depotFile%s"% fnum):1757 path = commit["depotFile%s"% fnum]1758 found = [p for p in self.depotPaths1759ifp4PathStartsWith(path, p)]1760if not found:1761 fnum = fnum +11762continue17631764file= {}1765file["path"] = path1766file["rev"] = commit["rev%s"% fnum]1767file["action"] = commit["action%s"% fnum]1768file["type"] = commit["type%s"% fnum]1769 fnum = fnum +117701771 relPath = self.stripRepoPath(path, self.depotPaths)17721773for branch in self.knownBranches.keys():17741775# add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.21776if relPath.startswith(branch +"/"):1777if branch not in branches:1778 branches[branch] = []1779 branches[branch].append(file)1780break17811782return branches17831784# output one file from the P4 stream1785# - helper for streamP4Files17861787defstreamOneP4File(self,file, contents):1788 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)1789 relPath = self.wildcard_decode(relPath)1790if verbose:1791 sys.stderr.write("%s\n"% relPath)17921793(type_base, type_mods) =split_p4_type(file["type"])17941795 git_mode ="100644"1796if"x"in type_mods:1797 git_mode ="100755"1798if type_base =="symlink":1799 git_mode ="120000"1800# p4 print on a symlink contains "target\n"; remove the newline1801 data =''.join(contents)1802 contents = [data[:-1]]18031804if type_base =="utf16":1805# p4 delivers different text in the python output to -G1806# than it does when using "print -o", or normal p4 client1807# operations. utf16 is converted to ascii or utf8, perhaps.1808# But ascii text saved as -t utf16 is completely mangled.1809# Invoke print -o to get the real contents.1810 text =p4_read_pipe(['print','-q','-o','-',file['depotFile']])1811 contents = [ text ]18121813if type_base =="apple":1814# Apple filetype files will be streamed as a concatenation of1815# its appledouble header and the contents. This is useless1816# on both macs and non-macs. If using "print -q -o xx", it1817# will create "xx" with the data, and "%xx" with the header.1818# This is also not very useful.1819#1820# Ideally, someday, this script can learn how to generate1821# appledouble files directly and import those to git, but1822# non-mac machines can never find a use for apple filetype.1823print"\nIgnoring apple filetype file%s"%file['depotFile']1824return18251826# Perhaps windows wants unicode, utf16 newlines translated too;1827# but this is not doing it.1828if self.isWindows and type_base =="text":1829 mangled = []1830for data in contents:1831 data = data.replace("\r\n","\n")1832 mangled.append(data)1833 contents = mangled18341835# Note that we do not try to de-mangle keywords on utf16 files,1836# even though in theory somebody may want that.1837 pattern =p4_keywords_regexp_for_type(type_base, type_mods)1838if pattern:1839 regexp = re.compile(pattern, re.VERBOSE)1840 text =''.join(contents)1841 text = regexp.sub(r'$\1$', text)1842 contents = [ text ]18431844 self.gitStream.write("M%sinline%s\n"% (git_mode, relPath))18451846# total length...1847 length =01848for d in contents:1849 length = length +len(d)18501851 self.gitStream.write("data%d\n"% length)1852for d in contents:1853 self.gitStream.write(d)1854 self.gitStream.write("\n")18551856defstreamOneP4Deletion(self,file):1857 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)1858if verbose:1859 sys.stderr.write("delete%s\n"% relPath)1860 self.gitStream.write("D%s\n"% relPath)18611862# handle another chunk of streaming data1863defstreamP4FilesCb(self, marshalled):18641865if marshalled.has_key('depotFile')and self.stream_have_file_info:1866# start of a new file - output the old one first1867 self.streamOneP4File(self.stream_file, self.stream_contents)1868 self.stream_file = {}1869 self.stream_contents = []1870 self.stream_have_file_info =False18711872# pick up the new file information... for the1873# 'data' field we need to append to our array1874for k in marshalled.keys():1875if k =='data':1876 self.stream_contents.append(marshalled['data'])1877else:1878 self.stream_file[k] = marshalled[k]18791880 self.stream_have_file_info =True18811882# Stream directly from "p4 files" into "git fast-import"1883defstreamP4Files(self, files):1884 filesForCommit = []1885 filesToRead = []1886 filesToDelete = []18871888for f in files:1889# if using a client spec, only add the files that have1890# a path in the client1891if self.clientSpecDirs:1892if self.clientSpecDirs.map_in_client(f['path']) =="":1893continue18941895 filesForCommit.append(f)1896if f['action']in self.delete_actions:1897 filesToDelete.append(f)1898else:1899 filesToRead.append(f)19001901# deleted files...1902for f in filesToDelete:1903 self.streamOneP4Deletion(f)19041905iflen(filesToRead) >0:1906 self.stream_file = {}1907 self.stream_contents = []1908 self.stream_have_file_info =False19091910# curry self argument1911defstreamP4FilesCbSelf(entry):1912 self.streamP4FilesCb(entry)19131914 fileArgs = ['%s#%s'% (f['path'], f['rev'])for f in filesToRead]19151916p4CmdList(["-x","-","print"],1917 stdin=fileArgs,1918 cb=streamP4FilesCbSelf)19191920# do the last chunk1921if self.stream_file.has_key('depotFile'):1922 self.streamOneP4File(self.stream_file, self.stream_contents)19231924defmake_email(self, userid):1925if userid in self.users:1926return self.users[userid]1927else:1928return"%s<a@b>"% userid19291930# Stream a p4 tag1931defstreamTag(self, gitStream, labelName, labelDetails, commit, epoch):1932if verbose:1933print"writing tag%sfor commit%s"% (labelName, commit)1934 gitStream.write("tag%s\n"% labelName)1935 gitStream.write("from%s\n"% commit)19361937if labelDetails.has_key('Owner'):1938 owner = labelDetails["Owner"]1939else:1940 owner =None19411942# Try to use the owner of the p4 label, or failing that,1943# the current p4 user id.1944if owner:1945 email = self.make_email(owner)1946else:1947 email = self.make_email(self.p4UserId())1948 tagger ="%s %s %s"% (email, epoch, self.tz)19491950 gitStream.write("tagger%s\n"% tagger)19511952print"labelDetails=",labelDetails1953if labelDetails.has_key('Description'):1954 description = labelDetails['Description']1955else:1956 description ='Label from git p4'19571958 gitStream.write("data%d\n"%len(description))1959 gitStream.write(description)1960 gitStream.write("\n")19611962defcommit(self, details, files, branch, branchPrefixes, parent =""):1963 epoch = details["time"]1964 author = details["user"]1965 self.branchPrefixes = branchPrefixes19661967if self.verbose:1968print"commit into%s"% branch19691970# start with reading files; if that fails, we should not1971# create a commit.1972 new_files = []1973for f in files:1974if[p for p in branchPrefixes ifp4PathStartsWith(f['path'], p)]:1975 new_files.append(f)1976else:1977 sys.stderr.write("Ignoring file outside of prefix:%s\n"% f['path'])19781979 self.gitStream.write("commit%s\n"% branch)1980# gitStream.write("mark :%s\n" % details["change"])1981 self.committedChanges.add(int(details["change"]))1982 committer =""1983if author not in self.users:1984 self.getUserMapFromPerforceServer()1985 committer ="%s %s %s"% (self.make_email(author), epoch, self.tz)19861987 self.gitStream.write("committer%s\n"% committer)19881989 self.gitStream.write("data <<EOT\n")1990 self.gitStream.write(details["desc"])1991 self.gitStream.write("\n[git-p4: depot-paths =\"%s\": change =%s"1992% (','.join(branchPrefixes), details["change"]))1993iflen(details['options']) >0:1994 self.gitStream.write(": options =%s"% details['options'])1995 self.gitStream.write("]\nEOT\n\n")19961997iflen(parent) >0:1998if self.verbose:1999print"parent%s"% parent2000 self.gitStream.write("from%s\n"% parent)20012002 self.streamP4Files(new_files)2003 self.gitStream.write("\n")20042005 change =int(details["change"])20062007if self.labels.has_key(change):2008 label = self.labels[change]2009 labelDetails = label[0]2010 labelRevisions = label[1]2011if self.verbose:2012print"Change%sis labelled%s"% (change, labelDetails)20132014 files =p4CmdList(["files"] + ["%s...@%s"% (p, change)2015for p in branchPrefixes])20162017iflen(files) ==len(labelRevisions):20182019 cleanedFiles = {}2020for info in files:2021if info["action"]in self.delete_actions:2022continue2023 cleanedFiles[info["depotFile"]] = info["rev"]20242025if cleanedFiles == labelRevisions:2026 self.streamTag(self.gitStream,'tag_%s'% labelDetails['label'], labelDetails, branch, epoch)20272028else:2029if not self.silent:2030print("Tag%sdoes not match with change%s: files do not match."2031% (labelDetails["label"], change))20322033else:2034if not self.silent:2035print("Tag%sdoes not match with change%s: file count is different."2036% (labelDetails["label"], change))20372038# Build a dictionary of changelists and labels, for "detect-labels" option.2039defgetLabels(self):2040 self.labels = {}20412042 l =p4CmdList(["labels"] + ["%s..."% p for p in self.depotPaths])2043iflen(l) >0and not self.silent:2044print"Finding files belonging to labels in%s"% `self.depotPaths`20452046for output in l:2047 label = output["label"]2048 revisions = {}2049 newestChange =02050if self.verbose:2051print"Querying files for label%s"% label2052forfileinp4CmdList(["files"] +2053["%s...@%s"% (p, label)2054for p in self.depotPaths]):2055 revisions[file["depotFile"]] =file["rev"]2056 change =int(file["change"])2057if change > newestChange:2058 newestChange = change20592060 self.labels[newestChange] = [output, revisions]20612062if self.verbose:2063print"Label changes:%s"% self.labels.keys()20642065# Import p4 labels as git tags. A direct mapping does not2066# exist, so assume that if all the files are at the same revision2067# then we can use that, or it's something more complicated we should2068# just ignore.2069defimportP4Labels(self, stream, p4Labels):2070if verbose:2071print"import p4 labels: "+' '.join(p4Labels)20722073 ignoredP4Labels =gitConfigList("git-p4.ignoredP4Labels")2074 validLabelRegexp =gitConfig("git-p4.labelImportRegexp")2075iflen(validLabelRegexp) ==0:2076 validLabelRegexp = defaultLabelRegexp2077 m = re.compile(validLabelRegexp)20782079for name in p4Labels:2080 commitFound =False20812082if not m.match(name):2083if verbose:2084print"label%sdoes not match regexp%s"% (name,validLabelRegexp)2085continue20862087if name in ignoredP4Labels:2088continue20892090 labelDetails =p4CmdList(['label',"-o", name])[0]20912092# get the most recent changelist for each file in this label2093 change =p4Cmd(["changes","-m","1"] + ["%s...@%s"% (p, name)2094for p in self.depotPaths])20952096if change.has_key('change'):2097# find the corresponding git commit; take the oldest commit2098 changelist =int(change['change'])2099 gitCommit =read_pipe(["git","rev-list","--max-count=1",2100"--reverse",":/\[git-p4:.*change =%d\]"% changelist])2101iflen(gitCommit) ==0:2102print"could not find git commit for changelist%d"% changelist2103else:2104 gitCommit = gitCommit.strip()2105 commitFound =True2106# Convert from p4 time format2107try:2108 tmwhen = time.strptime(labelDetails['Update'],"%Y/%m/%d%H:%M:%S")2109exceptValueError:2110print"Could not convert label time%s"% labelDetail['Update']2111 tmwhen =121122113 when =int(time.mktime(tmwhen))2114 self.streamTag(stream, name, labelDetails, gitCommit, when)2115if verbose:2116print"p4 label%smapped to git commit%s"% (name, gitCommit)2117else:2118if verbose:2119print"Label%shas no changelists - possibly deleted?"% name21202121if not commitFound:2122# We can't import this label; don't try again as it will get very2123# expensive repeatedly fetching all the files for labels that will2124# never be imported. If the label is moved in the future, the2125# ignore will need to be removed manually.2126system(["git","config","--add","git-p4.ignoredP4Labels", name])21272128defguessProjectName(self):2129for p in self.depotPaths:2130if p.endswith("/"):2131 p = p[:-1]2132 p = p[p.strip().rfind("/") +1:]2133if not p.endswith("/"):2134 p +="/"2135return p21362137defgetBranchMapping(self):2138 lostAndFoundBranches =set()21392140 user =gitConfig("git-p4.branchUser")2141iflen(user) >0:2142 command ="branches -u%s"% user2143else:2144 command ="branches"21452146for info inp4CmdList(command):2147 details =p4Cmd(["branch","-o", info["branch"]])2148 viewIdx =02149while details.has_key("View%s"% viewIdx):2150 paths = details["View%s"% viewIdx].split(" ")2151 viewIdx = viewIdx +12152# require standard //depot/foo/... //depot/bar/... mapping2153iflen(paths) !=2or not paths[0].endswith("/...")or not paths[1].endswith("/..."):2154continue2155 source = paths[0]2156 destination = paths[1]2157## HACK2158ifp4PathStartsWith(source, self.depotPaths[0])andp4PathStartsWith(destination, self.depotPaths[0]):2159 source = source[len(self.depotPaths[0]):-4]2160 destination = destination[len(self.depotPaths[0]):-4]21612162if destination in self.knownBranches:2163if not self.silent:2164print"p4 branch%sdefines a mapping from%sto%s"% (info["branch"], source, destination)2165print"but there exists another mapping from%sto%salready!"% (self.knownBranches[destination], destination)2166continue21672168 self.knownBranches[destination] = source21692170 lostAndFoundBranches.discard(destination)21712172if source not in self.knownBranches:2173 lostAndFoundBranches.add(source)21742175# Perforce does not strictly require branches to be defined, so we also2176# check git config for a branch list.2177#2178# Example of branch definition in git config file:2179# [git-p4]2180# branchList=main:branchA2181# branchList=main:branchB2182# branchList=branchA:branchC2183 configBranches =gitConfigList("git-p4.branchList")2184for branch in configBranches:2185if branch:2186(source, destination) = branch.split(":")2187 self.knownBranches[destination] = source21882189 lostAndFoundBranches.discard(destination)21902191if source not in self.knownBranches:2192 lostAndFoundBranches.add(source)219321942195for branch in lostAndFoundBranches:2196 self.knownBranches[branch] = branch21972198defgetBranchMappingFromGitBranches(self):2199 branches =p4BranchesInGit(self.importIntoRemotes)2200for branch in branches.keys():2201if branch =="master":2202 branch ="main"2203else:2204 branch = branch[len(self.projectName):]2205 self.knownBranches[branch] = branch22062207deflistExistingP4GitBranches(self):2208# branches holds mapping from name to commit2209 branches =p4BranchesInGit(self.importIntoRemotes)2210 self.p4BranchesInGit = branches.keys()2211for branch in branches.keys():2212 self.initialParents[self.refPrefix + branch] = branches[branch]22132214defupdateOptionDict(self, d):2215 option_keys = {}2216if self.keepRepoPath:2217 option_keys['keepRepoPath'] =122182219 d["options"] =' '.join(sorted(option_keys.keys()))22202221defreadOptions(self, d):2222 self.keepRepoPath = (d.has_key('options')2223and('keepRepoPath'in d['options']))22242225defgitRefForBranch(self, branch):2226if branch =="main":2227return self.refPrefix +"master"22282229iflen(branch) <=0:2230return branch22312232return self.refPrefix + self.projectName + branch22332234defgitCommitByP4Change(self, ref, change):2235if self.verbose:2236print"looking in ref "+ ref +" for change%susing bisect..."% change22372238 earliestCommit =""2239 latestCommit =parseRevision(ref)22402241while True:2242if self.verbose:2243print"trying: earliest%slatest%s"% (earliestCommit, latestCommit)2244 next =read_pipe("git rev-list --bisect%s %s"% (latestCommit, earliestCommit)).strip()2245iflen(next) ==0:2246if self.verbose:2247print"argh"2248return""2249 log =extractLogMessageFromGitCommit(next)2250 settings =extractSettingsGitLog(log)2251 currentChange =int(settings['change'])2252if self.verbose:2253print"current change%s"% currentChange22542255if currentChange == change:2256if self.verbose:2257print"found%s"% next2258return next22592260if currentChange < change:2261 earliestCommit ="^%s"% next2262else:2263 latestCommit ="%s"% next22642265return""22662267defimportNewBranch(self, branch, maxChange):2268# make fast-import flush all changes to disk and update the refs using the checkpoint2269# command so that we can try to find the branch parent in the git history2270 self.gitStream.write("checkpoint\n\n");2271 self.gitStream.flush();2272 branchPrefix = self.depotPaths[0] + branch +"/"2273range="@1,%s"% maxChange2274#print "prefix" + branchPrefix2275 changes =p4ChangesForPaths([branchPrefix],range)2276iflen(changes) <=0:2277return False2278 firstChange = changes[0]2279#print "first change in branch: %s" % firstChange2280 sourceBranch = self.knownBranches[branch]2281 sourceDepotPath = self.depotPaths[0] + sourceBranch2282 sourceRef = self.gitRefForBranch(sourceBranch)2283#print "source " + sourceBranch22842285 branchParentChange =int(p4Cmd(["changes","-m","1","%s...@1,%s"% (sourceDepotPath, firstChange)])["change"])2286#print "branch parent: %s" % branchParentChange2287 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)2288iflen(gitParent) >0:2289 self.initialParents[self.gitRefForBranch(branch)] = gitParent2290#print "parent git commit: %s" % gitParent22912292 self.importChanges(changes)2293return True22942295defsearchParent(self, parent, branch, target):2296 parentFound =False2297for blob inread_pipe_lines(["git","rev-list","--reverse","--no-merges", parent]):2298 blob = blob.strip()2299iflen(read_pipe(["git","diff-tree", blob, target])) ==0:2300 parentFound =True2301if self.verbose:2302print"Found parent of%sin commit%s"% (branch, blob)2303break2304if parentFound:2305return blob2306else:2307return None23082309defimportChanges(self, changes):2310 cnt =12311for change in changes:2312 description =p4Cmd(["describe",str(change)])2313 self.updateOptionDict(description)23142315if not self.silent:2316 sys.stdout.write("\rImporting revision%s(%s%%)"% (change, cnt *100/len(changes)))2317 sys.stdout.flush()2318 cnt = cnt +123192320try:2321if self.detectBranches:2322 branches = self.splitFilesIntoBranches(description)2323for branch in branches.keys():2324## HACK --hwn2325 branchPrefix = self.depotPaths[0] + branch +"/"23262327 parent =""23282329 filesForCommit = branches[branch]23302331if self.verbose:2332print"branch is%s"% branch23332334 self.updatedBranches.add(branch)23352336if branch not in self.createdBranches:2337 self.createdBranches.add(branch)2338 parent = self.knownBranches[branch]2339if parent == branch:2340 parent =""2341else:2342 fullBranch = self.projectName + branch2343if fullBranch not in self.p4BranchesInGit:2344if not self.silent:2345print("\nImporting new branch%s"% fullBranch);2346if self.importNewBranch(branch, change -1):2347 parent =""2348 self.p4BranchesInGit.append(fullBranch)2349if not self.silent:2350print("\nResuming with change%s"% change);23512352if self.verbose:2353print"parent determined through known branches:%s"% parent23542355 branch = self.gitRefForBranch(branch)2356 parent = self.gitRefForBranch(parent)23572358if self.verbose:2359print"looking for initial parent for%s; current parent is%s"% (branch, parent)23602361iflen(parent) ==0and branch in self.initialParents:2362 parent = self.initialParents[branch]2363del self.initialParents[branch]23642365 blob =None2366iflen(parent) >0:2367 tempBranch = os.path.join(self.tempBranchLocation,"%d"% (change))2368if self.verbose:2369print"Creating temporary branch: "+ tempBranch2370 self.commit(description, filesForCommit, tempBranch, [branchPrefix])2371 self.tempBranches.append(tempBranch)2372 self.checkpoint()2373 blob = self.searchParent(parent, branch, tempBranch)2374if blob:2375 self.commit(description, filesForCommit, branch, [branchPrefix], blob)2376else:2377if self.verbose:2378print"Parent of%snot found. Committing into head of%s"% (branch, parent)2379 self.commit(description, filesForCommit, branch, [branchPrefix], parent)2380else:2381 files = self.extractFilesFromCommit(description)2382 self.commit(description, files, self.branch, self.depotPaths,2383 self.initialParent)2384 self.initialParent =""2385exceptIOError:2386print self.gitError.read()2387 sys.exit(1)23882389defimportHeadRevision(self, revision):2390print"Doing initial import of%sfrom revision%sinto%s"% (' '.join(self.depotPaths), revision, self.branch)23912392 details = {}2393 details["user"] ="git perforce import user"2394 details["desc"] = ("Initial import of%sfrom the state at revision%s\n"2395% (' '.join(self.depotPaths), revision))2396 details["change"] = revision2397 newestRevision =023982399 fileCnt =02400 fileArgs = ["%s...%s"% (p,revision)for p in self.depotPaths]24012402for info inp4CmdList(["files"] + fileArgs):24032404if'code'in info and info['code'] =='error':2405 sys.stderr.write("p4 returned an error:%s\n"2406% info['data'])2407if info['data'].find("must refer to client") >=0:2408 sys.stderr.write("This particular p4 error is misleading.\n")2409 sys.stderr.write("Perhaps the depot path was misspelled.\n");2410 sys.stderr.write("Depot path:%s\n"%" ".join(self.depotPaths))2411 sys.exit(1)2412if'p4ExitCode'in info:2413 sys.stderr.write("p4 exitcode:%s\n"% info['p4ExitCode'])2414 sys.exit(1)241524162417 change =int(info["change"])2418if change > newestRevision:2419 newestRevision = change24202421if info["action"]in self.delete_actions:2422# don't increase the file cnt, otherwise details["depotFile123"] will have gaps!2423#fileCnt = fileCnt + 12424continue24252426for prop in["depotFile","rev","action","type"]:2427 details["%s%s"% (prop, fileCnt)] = info[prop]24282429 fileCnt = fileCnt +124302431 details["change"] = newestRevision24322433# Use time from top-most change so that all git p4 clones of2434# the same p4 repo have the same commit SHA1s.2435 res =p4CmdList("describe -s%d"% newestRevision)2436 newestTime =None2437for r in res:2438if r.has_key('time'):2439 newestTime =int(r['time'])2440if newestTime is None:2441die("\"describe -s\"on newest change%ddid not give a time")2442 details["time"] = newestTime24432444 self.updateOptionDict(details)2445try:2446 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPaths)2447exceptIOError:2448print"IO error with git fast-import. Is your git version recent enough?"2449print self.gitError.read()245024512452defrun(self, args):2453 self.depotPaths = []2454 self.changeRange =""2455 self.initialParent =""2456 self.previousDepotPaths = []24572458# map from branch depot path to parent branch2459 self.knownBranches = {}2460 self.initialParents = {}2461 self.hasOrigin =originP4BranchesExist()2462if not self.syncWithOrigin:2463 self.hasOrigin =False24642465if self.importIntoRemotes:2466 self.refPrefix ="refs/remotes/p4/"2467else:2468 self.refPrefix ="refs/heads/p4/"24692470if self.syncWithOrigin and self.hasOrigin:2471if not self.silent:2472print"Syncing with origin first by calling git fetch origin"2473system("git fetch origin")24742475iflen(self.branch) ==0:2476 self.branch = self.refPrefix +"master"2477ifgitBranchExists("refs/heads/p4")and self.importIntoRemotes:2478system("git update-ref%srefs/heads/p4"% self.branch)2479system("git branch -D p4");2480# create it /after/ importing, when master exists2481if notgitBranchExists(self.refPrefix +"HEAD")and self.importIntoRemotes andgitBranchExists(self.branch):2482system("git symbolic-ref%sHEAD%s"% (self.refPrefix, self.branch))24832484# accept either the command-line option, or the configuration variable2485if self.useClientSpec:2486# will use this after clone to set the variable2487 self.useClientSpec_from_options =True2488else:2489ifgitConfig("git-p4.useclientspec","--bool") =="true":2490 self.useClientSpec =True2491if self.useClientSpec:2492 self.clientSpecDirs =getClientSpec()24932494# TODO: should always look at previous commits,2495# merge with previous imports, if possible.2496if args == []:2497if self.hasOrigin:2498createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)2499 self.listExistingP4GitBranches()25002501iflen(self.p4BranchesInGit) >1:2502if not self.silent:2503print"Importing from/into multiple branches"2504 self.detectBranches =True25052506if self.verbose:2507print"branches:%s"% self.p4BranchesInGit25082509 p4Change =02510for branch in self.p4BranchesInGit:2511 logMsg =extractLogMessageFromGitCommit(self.refPrefix + branch)25122513 settings =extractSettingsGitLog(logMsg)25142515 self.readOptions(settings)2516if(settings.has_key('depot-paths')2517and settings.has_key('change')):2518 change =int(settings['change']) +12519 p4Change =max(p4Change, change)25202521 depotPaths =sorted(settings['depot-paths'])2522if self.previousDepotPaths == []:2523 self.previousDepotPaths = depotPaths2524else:2525 paths = []2526for(prev, cur)inzip(self.previousDepotPaths, depotPaths):2527 prev_list = prev.split("/")2528 cur_list = cur.split("/")2529for i inrange(0,min(len(cur_list),len(prev_list))):2530if cur_list[i] <> prev_list[i]:2531 i = i -12532break25332534 paths.append("/".join(cur_list[:i +1]))25352536 self.previousDepotPaths = paths25372538if p4Change >0:2539 self.depotPaths =sorted(self.previousDepotPaths)2540 self.changeRange ="@%s,#head"% p4Change2541if not self.detectBranches:2542 self.initialParent =parseRevision(self.branch)2543if not self.silent and not self.detectBranches:2544print"Performing incremental import into%sgit branch"% self.branch25452546if not self.branch.startswith("refs/"):2547 self.branch ="refs/heads/"+ self.branch25482549iflen(args) ==0and self.depotPaths:2550if not self.silent:2551print"Depot paths:%s"%' '.join(self.depotPaths)2552else:2553if self.depotPaths and self.depotPaths != args:2554print("previous import used depot path%sand now%swas specified. "2555"This doesn't work!"% (' '.join(self.depotPaths),2556' '.join(args)))2557 sys.exit(1)25582559 self.depotPaths =sorted(args)25602561 revision =""2562 self.users = {}25632564# Make sure no revision specifiers are used when --changesfile2565# is specified.2566 bad_changesfile =False2567iflen(self.changesFile) >0:2568for p in self.depotPaths:2569if p.find("@") >=0or p.find("#") >=0:2570 bad_changesfile =True2571break2572if bad_changesfile:2573die("Option --changesfile is incompatible with revision specifiers")25742575 newPaths = []2576for p in self.depotPaths:2577if p.find("@") != -1:2578 atIdx = p.index("@")2579 self.changeRange = p[atIdx:]2580if self.changeRange =="@all":2581 self.changeRange =""2582elif','not in self.changeRange:2583 revision = self.changeRange2584 self.changeRange =""2585 p = p[:atIdx]2586elif p.find("#") != -1:2587 hashIdx = p.index("#")2588 revision = p[hashIdx:]2589 p = p[:hashIdx]2590elif self.previousDepotPaths == []:2591# pay attention to changesfile, if given, else import2592# the entire p4 tree at the head revision2593iflen(self.changesFile) ==0:2594 revision ="#head"25952596 p = re.sub("\.\.\.$","", p)2597if not p.endswith("/"):2598 p +="/"25992600 newPaths.append(p)26012602 self.depotPaths = newPaths26032604 self.loadUserMapFromCache()2605 self.labels = {}2606if self.detectLabels:2607 self.getLabels();26082609if self.detectBranches:2610## FIXME - what's a P4 projectName ?2611 self.projectName = self.guessProjectName()26122613if self.hasOrigin:2614 self.getBranchMappingFromGitBranches()2615else:2616 self.getBranchMapping()2617if self.verbose:2618print"p4-git branches:%s"% self.p4BranchesInGit2619print"initial parents:%s"% self.initialParents2620for b in self.p4BranchesInGit:2621if b !="master":26222623## FIXME2624 b = b[len(self.projectName):]2625 self.createdBranches.add(b)26262627 self.tz ="%+03d%02d"% (- time.timezone /3600, ((- time.timezone %3600) /60))26282629 importProcess = subprocess.Popen(["git","fast-import"],2630 stdin=subprocess.PIPE, stdout=subprocess.PIPE,2631 stderr=subprocess.PIPE);2632 self.gitOutput = importProcess.stdout2633 self.gitStream = importProcess.stdin2634 self.gitError = importProcess.stderr26352636if revision:2637 self.importHeadRevision(revision)2638else:2639 changes = []26402641iflen(self.changesFile) >0:2642 output =open(self.changesFile).readlines()2643 changeSet =set()2644for line in output:2645 changeSet.add(int(line))26462647for change in changeSet:2648 changes.append(change)26492650 changes.sort()2651else:2652# catch "git p4 sync" with no new branches, in a repo that2653# does not have any existing p4 branches2654iflen(args) ==0and not self.p4BranchesInGit:2655die("No remote p4 branches. Perhaps you never did\"git p4 clone\"in here.");2656if self.verbose:2657print"Getting p4 changes for%s...%s"% (', '.join(self.depotPaths),2658 self.changeRange)2659 changes =p4ChangesForPaths(self.depotPaths, self.changeRange)26602661iflen(self.maxChanges) >0:2662 changes = changes[:min(int(self.maxChanges),len(changes))]26632664iflen(changes) ==0:2665if not self.silent:2666print"No changes to import!"2667else:2668if not self.silent and not self.detectBranches:2669print"Import destination:%s"% self.branch26702671 self.updatedBranches =set()26722673 self.importChanges(changes)26742675if not self.silent:2676print""2677iflen(self.updatedBranches) >0:2678 sys.stdout.write("Updated branches: ")2679for b in self.updatedBranches:2680 sys.stdout.write("%s"% b)2681 sys.stdout.write("\n")26822683ifgitConfig("git-p4.importLabels","--bool") =="true":2684 self.importLabels = true26852686if self.importLabels:2687 p4Labels =getP4Labels(self.depotPaths)2688 gitTags =getGitTags()26892690 missingP4Labels = p4Labels - gitTags2691 self.importP4Labels(self.gitStream, missingP4Labels)26922693 self.gitStream.close()2694if importProcess.wait() !=0:2695die("fast-import failed:%s"% self.gitError.read())2696 self.gitOutput.close()2697 self.gitError.close()26982699# Cleanup temporary branches created during import2700if self.tempBranches != []:2701for branch in self.tempBranches:2702read_pipe("git update-ref -d%s"% branch)2703 os.rmdir(os.path.join(os.environ.get("GIT_DIR",".git"), self.tempBranchLocation))27042705return True27062707classP4Rebase(Command):2708def__init__(self):2709 Command.__init__(self)2710 self.options = [2711 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),2712]2713 self.importLabels =False2714 self.description = ("Fetches the latest revision from perforce and "2715+"rebases the current work (branch) against it")27162717defrun(self, args):2718 sync =P4Sync()2719 sync.importLabels = self.importLabels2720 sync.run([])27212722return self.rebase()27232724defrebase(self):2725if os.system("git update-index --refresh") !=0:2726die("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.");2727iflen(read_pipe("git diff-index HEAD --")) >0:2728die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash.");27292730[upstream, settings] =findUpstreamBranchPoint()2731iflen(upstream) ==0:2732die("Cannot find upstream branchpoint for rebase")27332734# the branchpoint may be p4/foo~3, so strip off the parent2735 upstream = re.sub("~[0-9]+$","", upstream)27362737print"Rebasing the current branch onto%s"% upstream2738 oldHead =read_pipe("git rev-parse HEAD").strip()2739system("git rebase%s"% upstream)2740system("git diff-tree --stat --summary -M%sHEAD"% oldHead)2741return True27422743classP4Clone(P4Sync):2744def__init__(self):2745 P4Sync.__init__(self)2746 self.description ="Creates a new git repository and imports from Perforce into it"2747 self.usage ="usage: %prog [options] //depot/path[@revRange]"2748 self.options += [2749 optparse.make_option("--destination", dest="cloneDestination",2750 action='store', default=None,2751help="where to leave result of the clone"),2752 optparse.make_option("-/", dest="cloneExclude",2753 action="append",type="string",2754help="exclude depot path"),2755 optparse.make_option("--bare", dest="cloneBare",2756 action="store_true", default=False),2757]2758 self.cloneDestination =None2759 self.needsGit =False2760 self.cloneBare =False27612762# This is required for the "append" cloneExclude action2763defensure_value(self, attr, value):2764if nothasattr(self, attr)orgetattr(self, attr)is None:2765setattr(self, attr, value)2766returngetattr(self, attr)27672768defdefaultDestination(self, args):2769## TODO: use common prefix of args?2770 depotPath = args[0]2771 depotDir = re.sub("(@[^@]*)$","", depotPath)2772 depotDir = re.sub("(#[^#]*)$","", depotDir)2773 depotDir = re.sub(r"\.\.\.$","", depotDir)2774 depotDir = re.sub(r"/$","", depotDir)2775return os.path.split(depotDir)[1]27762777defrun(self, args):2778iflen(args) <1:2779return False27802781if self.keepRepoPath and not self.cloneDestination:2782 sys.stderr.write("Must specify destination for --keep-path\n")2783 sys.exit(1)27842785 depotPaths = args27862787if not self.cloneDestination andlen(depotPaths) >1:2788 self.cloneDestination = depotPaths[-1]2789 depotPaths = depotPaths[:-1]27902791 self.cloneExclude = ["/"+p for p in self.cloneExclude]2792for p in depotPaths:2793if not p.startswith("//"):2794return False27952796if not self.cloneDestination:2797 self.cloneDestination = self.defaultDestination(args)27982799print"Importing from%sinto%s"% (', '.join(depotPaths), self.cloneDestination)28002801if not os.path.exists(self.cloneDestination):2802 os.makedirs(self.cloneDestination)2803chdir(self.cloneDestination)28042805 init_cmd = ["git","init"]2806if self.cloneBare:2807 init_cmd.append("--bare")2808 subprocess.check_call(init_cmd)28092810if not P4Sync.run(self, depotPaths):2811return False2812if self.branch !="master":2813if self.importIntoRemotes:2814 masterbranch ="refs/remotes/p4/master"2815else:2816 masterbranch ="refs/heads/p4/master"2817ifgitBranchExists(masterbranch):2818system("git branch master%s"% masterbranch)2819if not self.cloneBare:2820system("git checkout -f")2821else:2822print"Could not detect main branch. No checkout/master branch created."28232824# auto-set this variable if invoked with --use-client-spec2825if self.useClientSpec_from_options:2826system("git config --bool git-p4.useclientspec true")28272828return True28292830classP4Branches(Command):2831def__init__(self):2832 Command.__init__(self)2833 self.options = [ ]2834 self.description = ("Shows the git branches that hold imports and their "2835+"corresponding perforce depot paths")2836 self.verbose =False28372838defrun(self, args):2839iforiginP4BranchesExist():2840createOrUpdateBranchesFromOrigin()28412842 cmdline ="git rev-parse --symbolic "2843 cmdline +=" --remotes"28442845for line inread_pipe_lines(cmdline):2846 line = line.strip()28472848if not line.startswith('p4/')or line =="p4/HEAD":2849continue2850 branch = line28512852 log =extractLogMessageFromGitCommit("refs/remotes/%s"% branch)2853 settings =extractSettingsGitLog(log)28542855print"%s<=%s(%s)"% (branch,",".join(settings["depot-paths"]), settings["change"])2856return True28572858classHelpFormatter(optparse.IndentedHelpFormatter):2859def__init__(self):2860 optparse.IndentedHelpFormatter.__init__(self)28612862defformat_description(self, description):2863if description:2864return description +"\n"2865else:2866return""28672868defprintUsage(commands):2869print"usage:%s<command> [options]"% sys.argv[0]2870print""2871print"valid commands:%s"%", ".join(commands)2872print""2873print"Try%s<command> --help for command specific help."% sys.argv[0]2874print""28752876commands = {2877"debug": P4Debug,2878"submit": P4Submit,2879"commit": P4Submit,2880"sync": P4Sync,2881"rebase": P4Rebase,2882"clone": P4Clone,2883"rollback": P4RollBack,2884"branches": P4Branches2885}288628872888defmain():2889iflen(sys.argv[1:]) ==0:2890printUsage(commands.keys())2891 sys.exit(2)28922893 cmd =""2894 cmdName = sys.argv[1]2895try:2896 klass = commands[cmdName]2897 cmd =klass()2898exceptKeyError:2899print"unknown command%s"% cmdName2900print""2901printUsage(commands.keys())2902 sys.exit(2)29032904 options = cmd.options2905 cmd.gitdir = os.environ.get("GIT_DIR",None)29062907 args = sys.argv[2:]29082909 options.append(optparse.make_option("--verbose", dest="verbose", action="store_true"))2910if cmd.needsGit:2911 options.append(optparse.make_option("--git-dir", dest="gitdir"))29122913 parser = optparse.OptionParser(cmd.usage.replace("%prog","%prog "+ cmdName),2914 options,2915 description = cmd.description,2916 formatter =HelpFormatter())29172918(cmd, args) = parser.parse_args(sys.argv[2:], cmd);2919global verbose2920 verbose = cmd.verbose2921if cmd.needsGit:2922if cmd.gitdir ==None:2923 cmd.gitdir = os.path.abspath(".git")2924if notisValidGitDir(cmd.gitdir):2925 cmd.gitdir =read_pipe("git rev-parse --git-dir").strip()2926if os.path.exists(cmd.gitdir):2927 cdup =read_pipe("git rev-parse --show-cdup").strip()2928iflen(cdup) >0:2929chdir(cdup);29302931if notisValidGitDir(cmd.gitdir):2932ifisValidGitDir(cmd.gitdir +"/.git"):2933 cmd.gitdir +="/.git"2934else:2935die("fatal: cannot locate git repository at%s"% cmd.gitdir)29362937 os.environ["GIT_DIR"] = cmd.gitdir29382939if not cmd.run(args):2940 parser.print_help()2941 sys.exit(2)294229432944if __name__ =='__main__':2945main()