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 pureRenameCopy =set()1042 filesToChangeExecBit = {}10431044for line in diff:1045 diff =parseDiffTreeEntry(line)1046 modifier = diff['status']1047 path = diff['src']1048if modifier =="M":1049p4_edit(path)1050ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1051 filesToChangeExecBit[path] = diff['dst_mode']1052 editedFiles.add(path)1053elif modifier =="A":1054 filesToAdd.add(path)1055 filesToChangeExecBit[path] = diff['dst_mode']1056if path in filesToDelete:1057 filesToDelete.remove(path)1058elif modifier =="D":1059 filesToDelete.add(path)1060if path in filesToAdd:1061 filesToAdd.remove(path)1062elif modifier =="C":1063 src, dest = diff['src'], diff['dst']1064p4_integrate(src, dest)1065 pureRenameCopy.add(dest)1066if diff['src_sha1'] != diff['dst_sha1']:1067p4_edit(dest)1068 pureRenameCopy.discard(dest)1069ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1070p4_edit(dest)1071 pureRenameCopy.discard(dest)1072 filesToChangeExecBit[dest] = diff['dst_mode']1073 os.unlink(dest)1074 editedFiles.add(dest)1075elif modifier =="R":1076 src, dest = diff['src'], diff['dst']1077p4_integrate(src, dest)1078if diff['src_sha1'] != diff['dst_sha1']:1079p4_edit(dest)1080else:1081 pureRenameCopy.add(dest)1082ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1083p4_edit(dest)1084 filesToChangeExecBit[dest] = diff['dst_mode']1085 os.unlink(dest)1086 editedFiles.add(dest)1087 filesToDelete.add(src)1088else:1089die("unknown modifier%sfor%s"% (modifier, path))10901091 diffcmd ="git format-patch -k --stdout\"%s^\"..\"%s\""% (id,id)1092 patchcmd = diffcmd +" | git apply "1093 tryPatchCmd = patchcmd +"--check -"1094 applyPatchCmd = patchcmd +"--check --apply -"1095 patch_succeeded =True10961097if os.system(tryPatchCmd) !=0:1098 fixed_rcs_keywords =False1099 patch_succeeded =False1100print"Unfortunately applying the change failed!"11011102# Patch failed, maybe it's just RCS keyword woes. Look through1103# the patch to see if that's possible.1104ifgitConfig("git-p4.attemptRCSCleanup","--bool") =="true":1105file=None1106 pattern =None1107 kwfiles = {}1108forfilein editedFiles | filesToDelete:1109# did this file's delta contain RCS keywords?1110 pattern =p4_keywords_regexp_for_file(file)11111112if pattern:1113# this file is a possibility...look for RCS keywords.1114 regexp = re.compile(pattern, re.VERBOSE)1115for line inread_pipe_lines(["git","diff","%s^..%s"% (id,id),file]):1116if regexp.search(line):1117if verbose:1118print"got keyword match on%sin%sin%s"% (pattern, line,file)1119 kwfiles[file] = pattern1120break11211122forfilein kwfiles:1123if verbose:1124print"zapping%swith%s"% (line,pattern)1125 self.patchRCSKeywords(file, kwfiles[file])1126 fixed_rcs_keywords =True11271128if fixed_rcs_keywords:1129print"Retrying the patch with RCS keywords cleaned up"1130if os.system(tryPatchCmd) ==0:1131 patch_succeeded =True11321133if not patch_succeeded:1134print"What do you want to do?"1135 response ="x"1136while response !="s"and response !="a"and response !="w":1137 response =raw_input("[s]kip this patch / [a]pply the patch forcibly "1138"and with .rej files / [w]rite the patch to a file (patch.txt) ")1139if response =="s":1140print"Skipping! Good luck with the next patches..."1141for f in editedFiles:1142p4_revert(f)1143for f in filesToAdd:1144 os.remove(f)1145return1146elif response =="a":1147 os.system(applyPatchCmd)1148iflen(filesToAdd) >0:1149print"You may also want to call p4 add on the following files:"1150print" ".join(filesToAdd)1151iflen(filesToDelete):1152print"The following files should be scheduled for deletion with p4 delete:"1153print" ".join(filesToDelete)1154die("Please resolve and submit the conflict manually and "1155+"continue afterwards with git p4 submit --continue")1156elif response =="w":1157system(diffcmd +" > patch.txt")1158print"Patch saved to patch.txt in%s!"% self.clientPath1159die("Please resolve and submit the conflict manually and "1160"continue afterwards with git p4 submit --continue")11611162system(applyPatchCmd)11631164for f in filesToAdd:1165p4_add(f)1166for f in filesToDelete:1167p4_revert(f)1168p4_delete(f)11691170# Set/clear executable bits1171for f in filesToChangeExecBit.keys():1172 mode = filesToChangeExecBit[f]1173setP4ExecBit(f, mode)11741175 logMessage =extractLogMessageFromGitCommit(id)1176 logMessage = logMessage.strip()11771178 template = self.prepareSubmitTemplate()11791180if self.interactive:1181 submitTemplate = self.prepareLogMessage(template, logMessage)11821183if self.preserveUser:1184 submitTemplate = submitTemplate + ("\n######## Actual user%s, modified after commit\n"% p4User)11851186if os.environ.has_key("P4DIFF"):1187del(os.environ["P4DIFF"])1188 diff =""1189for editedFile in editedFiles:1190 diff +=p4_read_pipe(['diff','-du', editedFile])11911192 newdiff =""1193for newFile in filesToAdd:1194 newdiff +="==== new file ====\n"1195 newdiff +="--- /dev/null\n"1196 newdiff +="+++%s\n"% newFile1197 f =open(newFile,"r")1198for line in f.readlines():1199 newdiff +="+"+ line1200 f.close()12011202if self.checkAuthorship and not self.p4UserIsMe(p4User):1203 submitTemplate +="######## git author%sdoes not match your p4 account.\n"% gitEmail1204 submitTemplate +="######## Use option --preserve-user to modify authorship.\n"1205 submitTemplate +="######## Variable git-p4.skipUserNameCheck hides this message.\n"12061207 separatorLine ="######## everything below this line is just the diff #######\n"12081209(handle, fileName) = tempfile.mkstemp()1210 tmpFile = os.fdopen(handle,"w+")1211if self.isWindows:1212 submitTemplate = submitTemplate.replace("\n","\r\n")1213 separatorLine = separatorLine.replace("\n","\r\n")1214 newdiff = newdiff.replace("\n","\r\n")1215 tmpFile.write(submitTemplate + separatorLine + diff + newdiff)1216 tmpFile.close()12171218if self.edit_template(fileName):1219# read the edited message and submit1220 tmpFile =open(fileName,"rb")1221 message = tmpFile.read()1222 tmpFile.close()1223 submitTemplate = message[:message.index(separatorLine)]1224if self.isWindows:1225 submitTemplate = submitTemplate.replace("\r\n","\n")1226p4_write_pipe(['submit','-i'], submitTemplate)12271228if self.preserveUser:1229if p4User:1230# Get last changelist number. Cannot easily get it from1231# the submit command output as the output is1232# unmarshalled.1233 changelist = self.lastP4Changelist()1234 self.modifyChangelistUser(changelist, p4User)12351236# The rename/copy happened by applying a patch that created a1237# new file. This leaves it writable, which confuses p4.1238for f in pureRenameCopy:1239p4_sync(f,"-f")12401241else:1242# skip this patch1243print"Submission cancelled, undoing p4 changes."1244for f in editedFiles:1245p4_revert(f)1246for f in filesToAdd:1247p4_revert(f)1248 os.remove(f)12491250 os.remove(fileName)1251else:1252 fileName ="submit.txt"1253file=open(fileName,"w+")1254file.write(self.prepareLogMessage(template, logMessage))1255file.close()1256print("Perforce submit template written as%s. "1257+"Please review/edit and then use p4 submit -i <%sto submit directly!"1258% (fileName, fileName))12591260# Export git tags as p4 labels. Create a p4 label and then tag1261# with that.1262defexportGitTags(self, gitTags):1263 validLabelRegexp =gitConfig("git-p4.labelExportRegexp")1264iflen(validLabelRegexp) ==0:1265 validLabelRegexp = defaultLabelRegexp1266 m = re.compile(validLabelRegexp)12671268for name in gitTags:12691270if not m.match(name):1271if verbose:1272print"tag%sdoes not match regexp%s"% (name, validTagRegexp)1273continue12741275# Get the p4 commit this corresponds to1276 logMessage =extractLogMessageFromGitCommit(name)1277 values =extractSettingsGitLog(logMessage)12781279if not values.has_key('change'):1280# a tag pointing to something not sent to p4; ignore1281if verbose:1282print"git tag%sdoes not give a p4 commit"% name1283continue1284else:1285 changelist = values['change']12861287# Get the tag details.1288 inHeader =True1289 isAnnotated =False1290 body = []1291for l inread_pipe_lines(["git","cat-file","-p", name]):1292 l = l.strip()1293if inHeader:1294if re.match(r'tag\s+', l):1295 isAnnotated =True1296elif re.match(r'\s*$', l):1297 inHeader =False1298continue1299else:1300 body.append(l)13011302if not isAnnotated:1303 body = ["lightweight tag imported by git p4\n"]13041305# Create the label - use the same view as the client spec we are using1306 clientSpec =getClientSpec()13071308 labelTemplate ="Label:%s\n"% name1309 labelTemplate +="Description:\n"1310for b in body:1311 labelTemplate +="\t"+ b +"\n"1312 labelTemplate +="View:\n"1313for mapping in clientSpec.mappings:1314 labelTemplate +="\t%s\n"% mapping.depot_side.path13151316p4_write_pipe(["label","-i"], labelTemplate)13171318# Use the label1319p4_system(["tag","-l", name] +1320["%s@%s"% (mapping.depot_side.path, changelist)for mapping in clientSpec.mappings])13211322if verbose:1323print"created p4 label for tag%s"% name13241325defrun(self, args):1326iflen(args) ==0:1327 self.master =currentGitBranch()1328iflen(self.master) ==0or notgitBranchExists("refs/heads/%s"% self.master):1329die("Detecting current git branch failed!")1330eliflen(args) ==1:1331 self.master = args[0]1332if notbranchExists(self.master):1333die("Branch%sdoes not exist"% self.master)1334else:1335return False13361337 allowSubmit =gitConfig("git-p4.allowSubmit")1338iflen(allowSubmit) >0and not self.master in allowSubmit.split(","):1339die("%sis not in git-p4.allowSubmit"% self.master)13401341[upstream, settings] =findUpstreamBranchPoint()1342 self.depotPath = settings['depot-paths'][0]1343iflen(self.origin) ==0:1344 self.origin = upstream13451346if self.preserveUser:1347if not self.canChangeChangelists():1348die("Cannot preserve user names without p4 super-user or admin permissions")13491350if self.verbose:1351print"Origin branch is "+ self.origin13521353iflen(self.depotPath) ==0:1354print"Internal error: cannot locate perforce depot path from existing branches"1355 sys.exit(128)13561357 self.useClientSpec =False1358ifgitConfig("git-p4.useclientspec","--bool") =="true":1359 self.useClientSpec =True1360if self.useClientSpec:1361 self.clientSpecDirs =getClientSpec()13621363if self.useClientSpec:1364# all files are relative to the client spec1365 self.clientPath =getClientRoot()1366else:1367 self.clientPath =p4Where(self.depotPath)13681369if self.clientPath =="":1370die("Error: Cannot locate perforce checkout of%sin client view"% self.depotPath)13711372print"Perforce checkout for depot path%slocated at%s"% (self.depotPath, self.clientPath)1373 self.oldWorkingDirectory = os.getcwd()13741375# ensure the clientPath exists1376 new_client_dir =False1377if not os.path.exists(self.clientPath):1378 new_client_dir =True1379 os.makedirs(self.clientPath)13801381chdir(self.clientPath)1382print"Synchronizing p4 checkout..."1383if new_client_dir:1384# old one was destroyed, and maybe nobody told p41385p4_sync("...","-f")1386else:1387p4_sync("...")1388 self.check()13891390 commits = []1391for line inread_pipe_lines("git rev-list --no-merges%s..%s"% (self.origin, self.master)):1392 commits.append(line.strip())1393 commits.reverse()13941395if self.preserveUser or(gitConfig("git-p4.skipUserNameCheck") =="true"):1396 self.checkAuthorship =False1397else:1398 self.checkAuthorship =True13991400if self.preserveUser:1401 self.checkValidP4Users(commits)14021403whilelen(commits) >0:1404 commit = commits[0]1405 commits = commits[1:]1406 self.applyCommit(commit)1407if not self.interactive:1408break14091410iflen(commits) ==0:1411print"All changes applied!"1412chdir(self.oldWorkingDirectory)14131414 sync =P4Sync()1415 sync.run([])14161417 rebase =P4Rebase()1418 rebase.rebase()14191420ifgitConfig("git-p4.exportLabels","--bool") =="true":1421 self.exportLabels = true14221423if self.exportLabels:1424 p4Labels =getP4Labels(self.depotPath)1425 gitTags =getGitTags()14261427 missingGitTags = gitTags - p4Labels1428 self.exportGitTags(missingGitTags)14291430return True14311432classView(object):1433"""Represent a p4 view ("p4 help views"), and map files in a1434 repo according to the view."""14351436classPath(object):1437"""A depot or client path, possibly containing wildcards.1438 The only one supported is ... at the end, currently.1439 Initialize with the full path, with //depot or //client."""14401441def__init__(self, path, is_depot):1442 self.path = path1443 self.is_depot = is_depot1444 self.find_wildcards()1445# remember the prefix bit, useful for relative mappings1446 m = re.match("(//[^/]+/)", self.path)1447if not m:1448die("Path%sdoes not start with //prefix/"% self.path)1449 prefix = m.group(1)1450if not self.is_depot:1451# strip //client/ on client paths1452 self.path = self.path[len(prefix):]14531454deffind_wildcards(self):1455"""Make sure wildcards are valid, and set up internal1456 variables."""14571458 self.ends_triple_dot =False1459# There are three wildcards allowed in p4 views1460# (see "p4 help views"). This code knows how to1461# handle "..." (only at the end), but cannot deal with1462# "%%n" or "*". Only check the depot_side, as p4 should1463# validate that the client_side matches too.1464if re.search(r'%%[1-9]', self.path):1465die("Can't handle%%n wildcards in view:%s"% self.path)1466if self.path.find("*") >=0:1467die("Can't handle * wildcards in view:%s"% self.path)1468 triple_dot_index = self.path.find("...")1469if triple_dot_index >=0:1470if triple_dot_index !=len(self.path) -3:1471die("Can handle only single ... wildcard, at end:%s"%1472 self.path)1473 self.ends_triple_dot =True14741475defensure_compatible(self, other_path):1476"""Make sure the wildcards agree."""1477if self.ends_triple_dot != other_path.ends_triple_dot:1478die("Both paths must end with ... if either does;\n"+1479"paths:%s %s"% (self.path, other_path.path))14801481defmatch_wildcards(self, test_path):1482"""See if this test_path matches us, and fill in the value1483 of the wildcards if so. Returns a tuple of1484 (True|False, wildcards[]). For now, only the ... at end1485 is supported, so at most one wildcard."""1486if self.ends_triple_dot:1487 dotless = self.path[:-3]1488if test_path.startswith(dotless):1489 wildcard = test_path[len(dotless):]1490return(True, [ wildcard ])1491else:1492if test_path == self.path:1493return(True, [])1494return(False, [])14951496defmatch(self, test_path):1497"""Just return if it matches; don't bother with the wildcards."""1498 b, _ = self.match_wildcards(test_path)1499return b15001501deffill_in_wildcards(self, wildcards):1502"""Return the relative path, with the wildcards filled in1503 if there are any."""1504if self.ends_triple_dot:1505return self.path[:-3] + wildcards[0]1506else:1507return self.path15081509classMapping(object):1510def__init__(self, depot_side, client_side, overlay, exclude):1511# depot_side is without the trailing /... if it had one1512 self.depot_side = View.Path(depot_side, is_depot=True)1513 self.client_side = View.Path(client_side, is_depot=False)1514 self.overlay = overlay # started with "+"1515 self.exclude = exclude # started with "-"1516assert not(self.overlay and self.exclude)1517 self.depot_side.ensure_compatible(self.client_side)15181519def__str__(self):1520 c =" "1521if self.overlay:1522 c ="+"1523if self.exclude:1524 c ="-"1525return"View.Mapping:%s%s->%s"% \1526(c, self.depot_side.path, self.client_side.path)15271528defmap_depot_to_client(self, depot_path):1529"""Calculate the client path if using this mapping on the1530 given depot path; does not consider the effect of other1531 mappings in a view. Even excluded mappings are returned."""1532 matches, wildcards = self.depot_side.match_wildcards(depot_path)1533if not matches:1534return""1535 client_path = self.client_side.fill_in_wildcards(wildcards)1536return client_path15371538#1539# View methods1540#1541def__init__(self):1542 self.mappings = []15431544defappend(self, view_line):1545"""Parse a view line, splitting it into depot and client1546 sides. Append to self.mappings, preserving order."""15471548# Split the view line into exactly two words. P4 enforces1549# structure on these lines that simplifies this quite a bit.1550#1551# Either or both words may be double-quoted.1552# Single quotes do not matter.1553# Double-quote marks cannot occur inside the words.1554# A + or - prefix is also inside the quotes.1555# There are no quotes unless they contain a space.1556# The line is already white-space stripped.1557# The two words are separated by a single space.1558#1559if view_line[0] =='"':1560# First word is double quoted. Find its end.1561 close_quote_index = view_line.find('"',1)1562if close_quote_index <=0:1563die("No first-word closing quote found:%s"% view_line)1564 depot_side = view_line[1:close_quote_index]1565# skip closing quote and space1566 rhs_index = close_quote_index +1+11567else:1568 space_index = view_line.find(" ")1569if space_index <=0:1570die("No word-splitting space found:%s"% view_line)1571 depot_side = view_line[0:space_index]1572 rhs_index = space_index +115731574if view_line[rhs_index] =='"':1575# Second word is double quoted. Make sure there is a1576# double quote at the end too.1577if not view_line.endswith('"'):1578die("View line with rhs quote should end with one:%s"%1579 view_line)1580# skip the quotes1581 client_side = view_line[rhs_index+1:-1]1582else:1583 client_side = view_line[rhs_index:]15841585# prefix + means overlay on previous mapping1586 overlay =False1587if depot_side.startswith("+"):1588 overlay =True1589 depot_side = depot_side[1:]15901591# prefix - means exclude this path1592 exclude =False1593if depot_side.startswith("-"):1594 exclude =True1595 depot_side = depot_side[1:]15961597 m = View.Mapping(depot_side, client_side, overlay, exclude)1598 self.mappings.append(m)15991600defmap_in_client(self, depot_path):1601"""Return the relative location in the client where this1602 depot file should live. Returns "" if the file should1603 not be mapped in the client."""16041605 paths_filled = []1606 client_path =""16071608# look at later entries first1609for m in self.mappings[::-1]:16101611# see where will this path end up in the client1612 p = m.map_depot_to_client(depot_path)16131614if p =="":1615# Depot path does not belong in client. Must remember1616# this, as previous items should not cause files to1617# exist in this path either. Remember that the list is1618# being walked from the end, which has higher precedence.1619# Overlap mappings do not exclude previous mappings.1620if not m.overlay:1621 paths_filled.append(m.client_side)16221623else:1624# This mapping matched; no need to search any further.1625# But, the mapping could be rejected if the client path1626# has already been claimed by an earlier mapping (i.e.1627# one later in the list, which we are walking backwards).1628 already_mapped_in_client =False1629for f in paths_filled:1630# this is View.Path.match1631if f.match(p):1632 already_mapped_in_client =True1633break1634if not already_mapped_in_client:1635# Include this file, unless it is from a line that1636# explicitly said to exclude it.1637if not m.exclude:1638 client_path = p16391640# a match, even if rejected, always stops the search1641break16421643return client_path16441645classP4Sync(Command, P4UserMap):1646 delete_actions = ("delete","move/delete","purge")16471648def__init__(self):1649 Command.__init__(self)1650 P4UserMap.__init__(self)1651 self.options = [1652 optparse.make_option("--branch", dest="branch"),1653 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),1654 optparse.make_option("--changesfile", dest="changesFile"),1655 optparse.make_option("--silent", dest="silent", action="store_true"),1656 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),1657 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),1658 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",1659help="Import into refs/heads/ , not refs/remotes"),1660 optparse.make_option("--max-changes", dest="maxChanges"),1661 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',1662help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),1663 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',1664help="Only sync files that are included in the Perforce Client Spec")1665]1666 self.description ="""Imports from Perforce into a git repository.\n1667 example:1668 //depot/my/project/ -- to import the current head1669 //depot/my/project/@all -- to import everything1670 //depot/my/project/@1,6 -- to import only from revision 1 to 616711672 (a ... is not needed in the path p4 specification, it's added implicitly)"""16731674 self.usage +=" //depot/path[@revRange]"1675 self.silent =False1676 self.createdBranches =set()1677 self.committedChanges =set()1678 self.branch =""1679 self.detectBranches =False1680 self.detectLabels =False1681 self.importLabels =False1682 self.changesFile =""1683 self.syncWithOrigin =True1684 self.importIntoRemotes =True1685 self.maxChanges =""1686 self.isWindows = (platform.system() =="Windows")1687 self.keepRepoPath =False1688 self.depotPaths =None1689 self.p4BranchesInGit = []1690 self.cloneExclude = []1691 self.useClientSpec =False1692 self.useClientSpec_from_options =False1693 self.clientSpecDirs =None1694 self.tempBranches = []1695 self.tempBranchLocation ="git-p4-tmp"16961697ifgitConfig("git-p4.syncFromOrigin") =="false":1698 self.syncWithOrigin =False16991700#1701# P4 wildcards are not allowed in filenames. P4 complains1702# if you simply add them, but you can force it with "-f", in1703# which case it translates them into %xx encoding internally.1704# Search for and fix just these four characters. Do % last so1705# that fixing it does not inadvertently create new %-escapes.1706#1707defwildcard_decode(self, path):1708# Cannot have * in a filename in windows; untested as to1709# what p4 would do in such a case.1710if not self.isWindows:1711 path = path.replace("%2A","*")1712 path = path.replace("%23","#") \1713.replace("%40","@") \1714.replace("%25","%")1715return path17161717# Force a checkpoint in fast-import and wait for it to finish1718defcheckpoint(self):1719 self.gitStream.write("checkpoint\n\n")1720 self.gitStream.write("progress checkpoint\n\n")1721 out = self.gitOutput.readline()1722if self.verbose:1723print"checkpoint finished: "+ out17241725defextractFilesFromCommit(self, commit):1726 self.cloneExclude = [re.sub(r"\.\.\.$","", path)1727for path in self.cloneExclude]1728 files = []1729 fnum =01730while commit.has_key("depotFile%s"% fnum):1731 path = commit["depotFile%s"% fnum]17321733if[p for p in self.cloneExclude1734ifp4PathStartsWith(path, p)]:1735 found =False1736else:1737 found = [p for p in self.depotPaths1738ifp4PathStartsWith(path, p)]1739if not found:1740 fnum = fnum +11741continue17421743file= {}1744file["path"] = path1745file["rev"] = commit["rev%s"% fnum]1746file["action"] = commit["action%s"% fnum]1747file["type"] = commit["type%s"% fnum]1748 files.append(file)1749 fnum = fnum +11750return files17511752defstripRepoPath(self, path, prefixes):1753if self.useClientSpec:1754return self.clientSpecDirs.map_in_client(path)17551756if self.keepRepoPath:1757 prefixes = [re.sub("^(//[^/]+/).*", r'\1', prefixes[0])]17581759for p in prefixes:1760ifp4PathStartsWith(path, p):1761 path = path[len(p):]17621763return path17641765defsplitFilesIntoBranches(self, commit):1766 branches = {}1767 fnum =01768while commit.has_key("depotFile%s"% fnum):1769 path = commit["depotFile%s"% fnum]1770 found = [p for p in self.depotPaths1771ifp4PathStartsWith(path, p)]1772if not found:1773 fnum = fnum +11774continue17751776file= {}1777file["path"] = path1778file["rev"] = commit["rev%s"% fnum]1779file["action"] = commit["action%s"% fnum]1780file["type"] = commit["type%s"% fnum]1781 fnum = fnum +117821783 relPath = self.stripRepoPath(path, self.depotPaths)17841785for branch in self.knownBranches.keys():17861787# add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.21788if relPath.startswith(branch +"/"):1789if branch not in branches:1790 branches[branch] = []1791 branches[branch].append(file)1792break17931794return branches17951796# output one file from the P4 stream1797# - helper for streamP4Files17981799defstreamOneP4File(self,file, contents):1800 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)1801 relPath = self.wildcard_decode(relPath)1802if verbose:1803 sys.stderr.write("%s\n"% relPath)18041805(type_base, type_mods) =split_p4_type(file["type"])18061807 git_mode ="100644"1808if"x"in type_mods:1809 git_mode ="100755"1810if type_base =="symlink":1811 git_mode ="120000"1812# p4 print on a symlink contains "target\n"; remove the newline1813 data =''.join(contents)1814 contents = [data[:-1]]18151816if type_base =="utf16":1817# p4 delivers different text in the python output to -G1818# than it does when using "print -o", or normal p4 client1819# operations. utf16 is converted to ascii or utf8, perhaps.1820# But ascii text saved as -t utf16 is completely mangled.1821# Invoke print -o to get the real contents.1822 text =p4_read_pipe(['print','-q','-o','-',file['depotFile']])1823 contents = [ text ]18241825if type_base =="apple":1826# Apple filetype files will be streamed as a concatenation of1827# its appledouble header and the contents. This is useless1828# on both macs and non-macs. If using "print -q -o xx", it1829# will create "xx" with the data, and "%xx" with the header.1830# This is also not very useful.1831#1832# Ideally, someday, this script can learn how to generate1833# appledouble files directly and import those to git, but1834# non-mac machines can never find a use for apple filetype.1835print"\nIgnoring apple filetype file%s"%file['depotFile']1836return18371838# Perhaps windows wants unicode, utf16 newlines translated too;1839# but this is not doing it.1840if self.isWindows and type_base =="text":1841 mangled = []1842for data in contents:1843 data = data.replace("\r\n","\n")1844 mangled.append(data)1845 contents = mangled18461847# Note that we do not try to de-mangle keywords on utf16 files,1848# even though in theory somebody may want that.1849 pattern =p4_keywords_regexp_for_type(type_base, type_mods)1850if pattern:1851 regexp = re.compile(pattern, re.VERBOSE)1852 text =''.join(contents)1853 text = regexp.sub(r'$\1$', text)1854 contents = [ text ]18551856 self.gitStream.write("M%sinline%s\n"% (git_mode, relPath))18571858# total length...1859 length =01860for d in contents:1861 length = length +len(d)18621863 self.gitStream.write("data%d\n"% length)1864for d in contents:1865 self.gitStream.write(d)1866 self.gitStream.write("\n")18671868defstreamOneP4Deletion(self,file):1869 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)1870if verbose:1871 sys.stderr.write("delete%s\n"% relPath)1872 self.gitStream.write("D%s\n"% relPath)18731874# handle another chunk of streaming data1875defstreamP4FilesCb(self, marshalled):18761877if marshalled.has_key('depotFile')and self.stream_have_file_info:1878# start of a new file - output the old one first1879 self.streamOneP4File(self.stream_file, self.stream_contents)1880 self.stream_file = {}1881 self.stream_contents = []1882 self.stream_have_file_info =False18831884# pick up the new file information... for the1885# 'data' field we need to append to our array1886for k in marshalled.keys():1887if k =='data':1888 self.stream_contents.append(marshalled['data'])1889else:1890 self.stream_file[k] = marshalled[k]18911892 self.stream_have_file_info =True18931894# Stream directly from "p4 files" into "git fast-import"1895defstreamP4Files(self, files):1896 filesForCommit = []1897 filesToRead = []1898 filesToDelete = []18991900for f in files:1901# if using a client spec, only add the files that have1902# a path in the client1903if self.clientSpecDirs:1904if self.clientSpecDirs.map_in_client(f['path']) =="":1905continue19061907 filesForCommit.append(f)1908if f['action']in self.delete_actions:1909 filesToDelete.append(f)1910else:1911 filesToRead.append(f)19121913# deleted files...1914for f in filesToDelete:1915 self.streamOneP4Deletion(f)19161917iflen(filesToRead) >0:1918 self.stream_file = {}1919 self.stream_contents = []1920 self.stream_have_file_info =False19211922# curry self argument1923defstreamP4FilesCbSelf(entry):1924 self.streamP4FilesCb(entry)19251926 fileArgs = ['%s#%s'% (f['path'], f['rev'])for f in filesToRead]19271928p4CmdList(["-x","-","print"],1929 stdin=fileArgs,1930 cb=streamP4FilesCbSelf)19311932# do the last chunk1933if self.stream_file.has_key('depotFile'):1934 self.streamOneP4File(self.stream_file, self.stream_contents)19351936defmake_email(self, userid):1937if userid in self.users:1938return self.users[userid]1939else:1940return"%s<a@b>"% userid19411942# Stream a p4 tag1943defstreamTag(self, gitStream, labelName, labelDetails, commit, epoch):1944if verbose:1945print"writing tag%sfor commit%s"% (labelName, commit)1946 gitStream.write("tag%s\n"% labelName)1947 gitStream.write("from%s\n"% commit)19481949if labelDetails.has_key('Owner'):1950 owner = labelDetails["Owner"]1951else:1952 owner =None19531954# Try to use the owner of the p4 label, or failing that,1955# the current p4 user id.1956if owner:1957 email = self.make_email(owner)1958else:1959 email = self.make_email(self.p4UserId())1960 tagger ="%s %s %s"% (email, epoch, self.tz)19611962 gitStream.write("tagger%s\n"% tagger)19631964print"labelDetails=",labelDetails1965if labelDetails.has_key('Description'):1966 description = labelDetails['Description']1967else:1968 description ='Label from git p4'19691970 gitStream.write("data%d\n"%len(description))1971 gitStream.write(description)1972 gitStream.write("\n")19731974defcommit(self, details, files, branch, branchPrefixes, parent =""):1975 epoch = details["time"]1976 author = details["user"]1977 self.branchPrefixes = branchPrefixes19781979if self.verbose:1980print"commit into%s"% branch19811982# start with reading files; if that fails, we should not1983# create a commit.1984 new_files = []1985for f in files:1986if[p for p in branchPrefixes ifp4PathStartsWith(f['path'], p)]:1987 new_files.append(f)1988else:1989 sys.stderr.write("Ignoring file outside of prefix:%s\n"% f['path'])19901991 self.gitStream.write("commit%s\n"% branch)1992# gitStream.write("mark :%s\n" % details["change"])1993 self.committedChanges.add(int(details["change"]))1994 committer =""1995if author not in self.users:1996 self.getUserMapFromPerforceServer()1997 committer ="%s %s %s"% (self.make_email(author), epoch, self.tz)19981999 self.gitStream.write("committer%s\n"% committer)20002001 self.gitStream.write("data <<EOT\n")2002 self.gitStream.write(details["desc"])2003 self.gitStream.write("\n[git-p4: depot-paths =\"%s\": change =%s"2004% (','.join(branchPrefixes), details["change"]))2005iflen(details['options']) >0:2006 self.gitStream.write(": options =%s"% details['options'])2007 self.gitStream.write("]\nEOT\n\n")20082009iflen(parent) >0:2010if self.verbose:2011print"parent%s"% parent2012 self.gitStream.write("from%s\n"% parent)20132014 self.streamP4Files(new_files)2015 self.gitStream.write("\n")20162017 change =int(details["change"])20182019if self.labels.has_key(change):2020 label = self.labels[change]2021 labelDetails = label[0]2022 labelRevisions = label[1]2023if self.verbose:2024print"Change%sis labelled%s"% (change, labelDetails)20252026 files =p4CmdList(["files"] + ["%s...@%s"% (p, change)2027for p in branchPrefixes])20282029iflen(files) ==len(labelRevisions):20302031 cleanedFiles = {}2032for info in files:2033if info["action"]in self.delete_actions:2034continue2035 cleanedFiles[info["depotFile"]] = info["rev"]20362037if cleanedFiles == labelRevisions:2038 self.streamTag(self.gitStream,'tag_%s'% labelDetails['label'], labelDetails, branch, epoch)20392040else:2041if not self.silent:2042print("Tag%sdoes not match with change%s: files do not match."2043% (labelDetails["label"], change))20442045else:2046if not self.silent:2047print("Tag%sdoes not match with change%s: file count is different."2048% (labelDetails["label"], change))20492050# Build a dictionary of changelists and labels, for "detect-labels" option.2051defgetLabels(self):2052 self.labels = {}20532054 l =p4CmdList(["labels"] + ["%s..."% p for p in self.depotPaths])2055iflen(l) >0and not self.silent:2056print"Finding files belonging to labels in%s"% `self.depotPaths`20572058for output in l:2059 label = output["label"]2060 revisions = {}2061 newestChange =02062if self.verbose:2063print"Querying files for label%s"% label2064forfileinp4CmdList(["files"] +2065["%s...@%s"% (p, label)2066for p in self.depotPaths]):2067 revisions[file["depotFile"]] =file["rev"]2068 change =int(file["change"])2069if change > newestChange:2070 newestChange = change20712072 self.labels[newestChange] = [output, revisions]20732074if self.verbose:2075print"Label changes:%s"% self.labels.keys()20762077# Import p4 labels as git tags. A direct mapping does not2078# exist, so assume that if all the files are at the same revision2079# then we can use that, or it's something more complicated we should2080# just ignore.2081defimportP4Labels(self, stream, p4Labels):2082if verbose:2083print"import p4 labels: "+' '.join(p4Labels)20842085 ignoredP4Labels =gitConfigList("git-p4.ignoredP4Labels")2086 validLabelRegexp =gitConfig("git-p4.labelImportRegexp")2087iflen(validLabelRegexp) ==0:2088 validLabelRegexp = defaultLabelRegexp2089 m = re.compile(validLabelRegexp)20902091for name in p4Labels:2092 commitFound =False20932094if not m.match(name):2095if verbose:2096print"label%sdoes not match regexp%s"% (name,validLabelRegexp)2097continue20982099if name in ignoredP4Labels:2100continue21012102 labelDetails =p4CmdList(['label',"-o", name])[0]21032104# get the most recent changelist for each file in this label2105 change =p4Cmd(["changes","-m","1"] + ["%s...@%s"% (p, name)2106for p in self.depotPaths])21072108if change.has_key('change'):2109# find the corresponding git commit; take the oldest commit2110 changelist =int(change['change'])2111 gitCommit =read_pipe(["git","rev-list","--max-count=1",2112"--reverse",":/\[git-p4:.*change =%d\]"% changelist])2113iflen(gitCommit) ==0:2114print"could not find git commit for changelist%d"% changelist2115else:2116 gitCommit = gitCommit.strip()2117 commitFound =True2118# Convert from p4 time format2119try:2120 tmwhen = time.strptime(labelDetails['Update'],"%Y/%m/%d%H:%M:%S")2121exceptValueError:2122print"Could not convert label time%s"% labelDetail['Update']2123 tmwhen =121242125 when =int(time.mktime(tmwhen))2126 self.streamTag(stream, name, labelDetails, gitCommit, when)2127if verbose:2128print"p4 label%smapped to git commit%s"% (name, gitCommit)2129else:2130if verbose:2131print"Label%shas no changelists - possibly deleted?"% name21322133if not commitFound:2134# We can't import this label; don't try again as it will get very2135# expensive repeatedly fetching all the files for labels that will2136# never be imported. If the label is moved in the future, the2137# ignore will need to be removed manually.2138system(["git","config","--add","git-p4.ignoredP4Labels", name])21392140defguessProjectName(self):2141for p in self.depotPaths:2142if p.endswith("/"):2143 p = p[:-1]2144 p = p[p.strip().rfind("/") +1:]2145if not p.endswith("/"):2146 p +="/"2147return p21482149defgetBranchMapping(self):2150 lostAndFoundBranches =set()21512152 user =gitConfig("git-p4.branchUser")2153iflen(user) >0:2154 command ="branches -u%s"% user2155else:2156 command ="branches"21572158for info inp4CmdList(command):2159 details =p4Cmd(["branch","-o", info["branch"]])2160 viewIdx =02161while details.has_key("View%s"% viewIdx):2162 paths = details["View%s"% viewIdx].split(" ")2163 viewIdx = viewIdx +12164# require standard //depot/foo/... //depot/bar/... mapping2165iflen(paths) !=2or not paths[0].endswith("/...")or not paths[1].endswith("/..."):2166continue2167 source = paths[0]2168 destination = paths[1]2169## HACK2170ifp4PathStartsWith(source, self.depotPaths[0])andp4PathStartsWith(destination, self.depotPaths[0]):2171 source = source[len(self.depotPaths[0]):-4]2172 destination = destination[len(self.depotPaths[0]):-4]21732174if destination in self.knownBranches:2175if not self.silent:2176print"p4 branch%sdefines a mapping from%sto%s"% (info["branch"], source, destination)2177print"but there exists another mapping from%sto%salready!"% (self.knownBranches[destination], destination)2178continue21792180 self.knownBranches[destination] = source21812182 lostAndFoundBranches.discard(destination)21832184if source not in self.knownBranches:2185 lostAndFoundBranches.add(source)21862187# Perforce does not strictly require branches to be defined, so we also2188# check git config for a branch list.2189#2190# Example of branch definition in git config file:2191# [git-p4]2192# branchList=main:branchA2193# branchList=main:branchB2194# branchList=branchA:branchC2195 configBranches =gitConfigList("git-p4.branchList")2196for branch in configBranches:2197if branch:2198(source, destination) = branch.split(":")2199 self.knownBranches[destination] = source22002201 lostAndFoundBranches.discard(destination)22022203if source not in self.knownBranches:2204 lostAndFoundBranches.add(source)220522062207for branch in lostAndFoundBranches:2208 self.knownBranches[branch] = branch22092210defgetBranchMappingFromGitBranches(self):2211 branches =p4BranchesInGit(self.importIntoRemotes)2212for branch in branches.keys():2213if branch =="master":2214 branch ="main"2215else:2216 branch = branch[len(self.projectName):]2217 self.knownBranches[branch] = branch22182219deflistExistingP4GitBranches(self):2220# branches holds mapping from name to commit2221 branches =p4BranchesInGit(self.importIntoRemotes)2222 self.p4BranchesInGit = branches.keys()2223for branch in branches.keys():2224 self.initialParents[self.refPrefix + branch] = branches[branch]22252226defupdateOptionDict(self, d):2227 option_keys = {}2228if self.keepRepoPath:2229 option_keys['keepRepoPath'] =122302231 d["options"] =' '.join(sorted(option_keys.keys()))22322233defreadOptions(self, d):2234 self.keepRepoPath = (d.has_key('options')2235and('keepRepoPath'in d['options']))22362237defgitRefForBranch(self, branch):2238if branch =="main":2239return self.refPrefix +"master"22402241iflen(branch) <=0:2242return branch22432244return self.refPrefix + self.projectName + branch22452246defgitCommitByP4Change(self, ref, change):2247if self.verbose:2248print"looking in ref "+ ref +" for change%susing bisect..."% change22492250 earliestCommit =""2251 latestCommit =parseRevision(ref)22522253while True:2254if self.verbose:2255print"trying: earliest%slatest%s"% (earliestCommit, latestCommit)2256 next =read_pipe("git rev-list --bisect%s %s"% (latestCommit, earliestCommit)).strip()2257iflen(next) ==0:2258if self.verbose:2259print"argh"2260return""2261 log =extractLogMessageFromGitCommit(next)2262 settings =extractSettingsGitLog(log)2263 currentChange =int(settings['change'])2264if self.verbose:2265print"current change%s"% currentChange22662267if currentChange == change:2268if self.verbose:2269print"found%s"% next2270return next22712272if currentChange < change:2273 earliestCommit ="^%s"% next2274else:2275 latestCommit ="%s"% next22762277return""22782279defimportNewBranch(self, branch, maxChange):2280# make fast-import flush all changes to disk and update the refs using the checkpoint2281# command so that we can try to find the branch parent in the git history2282 self.gitStream.write("checkpoint\n\n");2283 self.gitStream.flush();2284 branchPrefix = self.depotPaths[0] + branch +"/"2285range="@1,%s"% maxChange2286#print "prefix" + branchPrefix2287 changes =p4ChangesForPaths([branchPrefix],range)2288iflen(changes) <=0:2289return False2290 firstChange = changes[0]2291#print "first change in branch: %s" % firstChange2292 sourceBranch = self.knownBranches[branch]2293 sourceDepotPath = self.depotPaths[0] + sourceBranch2294 sourceRef = self.gitRefForBranch(sourceBranch)2295#print "source " + sourceBranch22962297 branchParentChange =int(p4Cmd(["changes","-m","1","%s...@1,%s"% (sourceDepotPath, firstChange)])["change"])2298#print "branch parent: %s" % branchParentChange2299 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)2300iflen(gitParent) >0:2301 self.initialParents[self.gitRefForBranch(branch)] = gitParent2302#print "parent git commit: %s" % gitParent23032304 self.importChanges(changes)2305return True23062307defsearchParent(self, parent, branch, target):2308 parentFound =False2309for blob inread_pipe_lines(["git","rev-list","--reverse","--no-merges", parent]):2310 blob = blob.strip()2311iflen(read_pipe(["git","diff-tree", blob, target])) ==0:2312 parentFound =True2313if self.verbose:2314print"Found parent of%sin commit%s"% (branch, blob)2315break2316if parentFound:2317return blob2318else:2319return None23202321defimportChanges(self, changes):2322 cnt =12323for change in changes:2324 description =p4Cmd(["describe",str(change)])2325 self.updateOptionDict(description)23262327if not self.silent:2328 sys.stdout.write("\rImporting revision%s(%s%%)"% (change, cnt *100/len(changes)))2329 sys.stdout.flush()2330 cnt = cnt +123312332try:2333if self.detectBranches:2334 branches = self.splitFilesIntoBranches(description)2335for branch in branches.keys():2336## HACK --hwn2337 branchPrefix = self.depotPaths[0] + branch +"/"23382339 parent =""23402341 filesForCommit = branches[branch]23422343if self.verbose:2344print"branch is%s"% branch23452346 self.updatedBranches.add(branch)23472348if branch not in self.createdBranches:2349 self.createdBranches.add(branch)2350 parent = self.knownBranches[branch]2351if parent == branch:2352 parent =""2353else:2354 fullBranch = self.projectName + branch2355if fullBranch not in self.p4BranchesInGit:2356if not self.silent:2357print("\nImporting new branch%s"% fullBranch);2358if self.importNewBranch(branch, change -1):2359 parent =""2360 self.p4BranchesInGit.append(fullBranch)2361if not self.silent:2362print("\nResuming with change%s"% change);23632364if self.verbose:2365print"parent determined through known branches:%s"% parent23662367 branch = self.gitRefForBranch(branch)2368 parent = self.gitRefForBranch(parent)23692370if self.verbose:2371print"looking for initial parent for%s; current parent is%s"% (branch, parent)23722373iflen(parent) ==0and branch in self.initialParents:2374 parent = self.initialParents[branch]2375del self.initialParents[branch]23762377 blob =None2378iflen(parent) >0:2379 tempBranch = os.path.join(self.tempBranchLocation,"%d"% (change))2380if self.verbose:2381print"Creating temporary branch: "+ tempBranch2382 self.commit(description, filesForCommit, tempBranch, [branchPrefix])2383 self.tempBranches.append(tempBranch)2384 self.checkpoint()2385 blob = self.searchParent(parent, branch, tempBranch)2386if blob:2387 self.commit(description, filesForCommit, branch, [branchPrefix], blob)2388else:2389if self.verbose:2390print"Parent of%snot found. Committing into head of%s"% (branch, parent)2391 self.commit(description, filesForCommit, branch, [branchPrefix], parent)2392else:2393 files = self.extractFilesFromCommit(description)2394 self.commit(description, files, self.branch, self.depotPaths,2395 self.initialParent)2396 self.initialParent =""2397exceptIOError:2398print self.gitError.read()2399 sys.exit(1)24002401defimportHeadRevision(self, revision):2402print"Doing initial import of%sfrom revision%sinto%s"% (' '.join(self.depotPaths), revision, self.branch)24032404 details = {}2405 details["user"] ="git perforce import user"2406 details["desc"] = ("Initial import of%sfrom the state at revision%s\n"2407% (' '.join(self.depotPaths), revision))2408 details["change"] = revision2409 newestRevision =024102411 fileCnt =02412 fileArgs = ["%s...%s"% (p,revision)for p in self.depotPaths]24132414for info inp4CmdList(["files"] + fileArgs):24152416if'code'in info and info['code'] =='error':2417 sys.stderr.write("p4 returned an error:%s\n"2418% info['data'])2419if info['data'].find("must refer to client") >=0:2420 sys.stderr.write("This particular p4 error is misleading.\n")2421 sys.stderr.write("Perhaps the depot path was misspelled.\n");2422 sys.stderr.write("Depot path:%s\n"%" ".join(self.depotPaths))2423 sys.exit(1)2424if'p4ExitCode'in info:2425 sys.stderr.write("p4 exitcode:%s\n"% info['p4ExitCode'])2426 sys.exit(1)242724282429 change =int(info["change"])2430if change > newestRevision:2431 newestRevision = change24322433if info["action"]in self.delete_actions:2434# don't increase the file cnt, otherwise details["depotFile123"] will have gaps!2435#fileCnt = fileCnt + 12436continue24372438for prop in["depotFile","rev","action","type"]:2439 details["%s%s"% (prop, fileCnt)] = info[prop]24402441 fileCnt = fileCnt +124422443 details["change"] = newestRevision24442445# Use time from top-most change so that all git p4 clones of2446# the same p4 repo have the same commit SHA1s.2447 res =p4CmdList("describe -s%d"% newestRevision)2448 newestTime =None2449for r in res:2450if r.has_key('time'):2451 newestTime =int(r['time'])2452if newestTime is None:2453die("\"describe -s\"on newest change%ddid not give a time")2454 details["time"] = newestTime24552456 self.updateOptionDict(details)2457try:2458 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPaths)2459exceptIOError:2460print"IO error with git fast-import. Is your git version recent enough?"2461print self.gitError.read()246224632464defrun(self, args):2465 self.depotPaths = []2466 self.changeRange =""2467 self.initialParent =""2468 self.previousDepotPaths = []24692470# map from branch depot path to parent branch2471 self.knownBranches = {}2472 self.initialParents = {}2473 self.hasOrigin =originP4BranchesExist()2474if not self.syncWithOrigin:2475 self.hasOrigin =False24762477if self.importIntoRemotes:2478 self.refPrefix ="refs/remotes/p4/"2479else:2480 self.refPrefix ="refs/heads/p4/"24812482if self.syncWithOrigin and self.hasOrigin:2483if not self.silent:2484print"Syncing with origin first by calling git fetch origin"2485system("git fetch origin")24862487iflen(self.branch) ==0:2488 self.branch = self.refPrefix +"master"2489ifgitBranchExists("refs/heads/p4")and self.importIntoRemotes:2490system("git update-ref%srefs/heads/p4"% self.branch)2491system("git branch -D p4");2492# create it /after/ importing, when master exists2493if notgitBranchExists(self.refPrefix +"HEAD")and self.importIntoRemotes andgitBranchExists(self.branch):2494system("git symbolic-ref%sHEAD%s"% (self.refPrefix, self.branch))24952496# accept either the command-line option, or the configuration variable2497if self.useClientSpec:2498# will use this after clone to set the variable2499 self.useClientSpec_from_options =True2500else:2501ifgitConfig("git-p4.useclientspec","--bool") =="true":2502 self.useClientSpec =True2503if self.useClientSpec:2504 self.clientSpecDirs =getClientSpec()25052506# TODO: should always look at previous commits,2507# merge with previous imports, if possible.2508if args == []:2509if self.hasOrigin:2510createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)2511 self.listExistingP4GitBranches()25122513iflen(self.p4BranchesInGit) >1:2514if not self.silent:2515print"Importing from/into multiple branches"2516 self.detectBranches =True25172518if self.verbose:2519print"branches:%s"% self.p4BranchesInGit25202521 p4Change =02522for branch in self.p4BranchesInGit:2523 logMsg =extractLogMessageFromGitCommit(self.refPrefix + branch)25242525 settings =extractSettingsGitLog(logMsg)25262527 self.readOptions(settings)2528if(settings.has_key('depot-paths')2529and settings.has_key('change')):2530 change =int(settings['change']) +12531 p4Change =max(p4Change, change)25322533 depotPaths =sorted(settings['depot-paths'])2534if self.previousDepotPaths == []:2535 self.previousDepotPaths = depotPaths2536else:2537 paths = []2538for(prev, cur)inzip(self.previousDepotPaths, depotPaths):2539 prev_list = prev.split("/")2540 cur_list = cur.split("/")2541for i inrange(0,min(len(cur_list),len(prev_list))):2542if cur_list[i] <> prev_list[i]:2543 i = i -12544break25452546 paths.append("/".join(cur_list[:i +1]))25472548 self.previousDepotPaths = paths25492550if p4Change >0:2551 self.depotPaths =sorted(self.previousDepotPaths)2552 self.changeRange ="@%s,#head"% p4Change2553if not self.detectBranches:2554 self.initialParent =parseRevision(self.branch)2555if not self.silent and not self.detectBranches:2556print"Performing incremental import into%sgit branch"% self.branch25572558if not self.branch.startswith("refs/"):2559 self.branch ="refs/heads/"+ self.branch25602561iflen(args) ==0and self.depotPaths:2562if not self.silent:2563print"Depot paths:%s"%' '.join(self.depotPaths)2564else:2565if self.depotPaths and self.depotPaths != args:2566print("previous import used depot path%sand now%swas specified. "2567"This doesn't work!"% (' '.join(self.depotPaths),2568' '.join(args)))2569 sys.exit(1)25702571 self.depotPaths =sorted(args)25722573 revision =""2574 self.users = {}25752576# Make sure no revision specifiers are used when --changesfile2577# is specified.2578 bad_changesfile =False2579iflen(self.changesFile) >0:2580for p in self.depotPaths:2581if p.find("@") >=0or p.find("#") >=0:2582 bad_changesfile =True2583break2584if bad_changesfile:2585die("Option --changesfile is incompatible with revision specifiers")25862587 newPaths = []2588for p in self.depotPaths:2589if p.find("@") != -1:2590 atIdx = p.index("@")2591 self.changeRange = p[atIdx:]2592if self.changeRange =="@all":2593 self.changeRange =""2594elif','not in self.changeRange:2595 revision = self.changeRange2596 self.changeRange =""2597 p = p[:atIdx]2598elif p.find("#") != -1:2599 hashIdx = p.index("#")2600 revision = p[hashIdx:]2601 p = p[:hashIdx]2602elif self.previousDepotPaths == []:2603# pay attention to changesfile, if given, else import2604# the entire p4 tree at the head revision2605iflen(self.changesFile) ==0:2606 revision ="#head"26072608 p = re.sub("\.\.\.$","", p)2609if not p.endswith("/"):2610 p +="/"26112612 newPaths.append(p)26132614 self.depotPaths = newPaths26152616 self.loadUserMapFromCache()2617 self.labels = {}2618if self.detectLabels:2619 self.getLabels();26202621if self.detectBranches:2622## FIXME - what's a P4 projectName ?2623 self.projectName = self.guessProjectName()26242625if self.hasOrigin:2626 self.getBranchMappingFromGitBranches()2627else:2628 self.getBranchMapping()2629if self.verbose:2630print"p4-git branches:%s"% self.p4BranchesInGit2631print"initial parents:%s"% self.initialParents2632for b in self.p4BranchesInGit:2633if b !="master":26342635## FIXME2636 b = b[len(self.projectName):]2637 self.createdBranches.add(b)26382639 self.tz ="%+03d%02d"% (- time.timezone /3600, ((- time.timezone %3600) /60))26402641 importProcess = subprocess.Popen(["git","fast-import"],2642 stdin=subprocess.PIPE, stdout=subprocess.PIPE,2643 stderr=subprocess.PIPE);2644 self.gitOutput = importProcess.stdout2645 self.gitStream = importProcess.stdin2646 self.gitError = importProcess.stderr26472648if revision:2649 self.importHeadRevision(revision)2650else:2651 changes = []26522653iflen(self.changesFile) >0:2654 output =open(self.changesFile).readlines()2655 changeSet =set()2656for line in output:2657 changeSet.add(int(line))26582659for change in changeSet:2660 changes.append(change)26612662 changes.sort()2663else:2664# catch "git p4 sync" with no new branches, in a repo that2665# does not have any existing p4 branches2666iflen(args) ==0and not self.p4BranchesInGit:2667die("No remote p4 branches. Perhaps you never did\"git p4 clone\"in here.");2668if self.verbose:2669print"Getting p4 changes for%s...%s"% (', '.join(self.depotPaths),2670 self.changeRange)2671 changes =p4ChangesForPaths(self.depotPaths, self.changeRange)26722673iflen(self.maxChanges) >0:2674 changes = changes[:min(int(self.maxChanges),len(changes))]26752676iflen(changes) ==0:2677if not self.silent:2678print"No changes to import!"2679else:2680if not self.silent and not self.detectBranches:2681print"Import destination:%s"% self.branch26822683 self.updatedBranches =set()26842685 self.importChanges(changes)26862687if not self.silent:2688print""2689iflen(self.updatedBranches) >0:2690 sys.stdout.write("Updated branches: ")2691for b in self.updatedBranches:2692 sys.stdout.write("%s"% b)2693 sys.stdout.write("\n")26942695ifgitConfig("git-p4.importLabels","--bool") =="true":2696 self.importLabels = true26972698if self.importLabels:2699 p4Labels =getP4Labels(self.depotPaths)2700 gitTags =getGitTags()27012702 missingP4Labels = p4Labels - gitTags2703 self.importP4Labels(self.gitStream, missingP4Labels)27042705 self.gitStream.close()2706if importProcess.wait() !=0:2707die("fast-import failed:%s"% self.gitError.read())2708 self.gitOutput.close()2709 self.gitError.close()27102711# Cleanup temporary branches created during import2712if self.tempBranches != []:2713for branch in self.tempBranches:2714read_pipe("git update-ref -d%s"% branch)2715 os.rmdir(os.path.join(os.environ.get("GIT_DIR",".git"), self.tempBranchLocation))27162717return True27182719classP4Rebase(Command):2720def__init__(self):2721 Command.__init__(self)2722 self.options = [2723 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),2724]2725 self.importLabels =False2726 self.description = ("Fetches the latest revision from perforce and "2727+"rebases the current work (branch) against it")27282729defrun(self, args):2730 sync =P4Sync()2731 sync.importLabels = self.importLabels2732 sync.run([])27332734return self.rebase()27352736defrebase(self):2737if os.system("git update-index --refresh") !=0:2738die("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.");2739iflen(read_pipe("git diff-index HEAD --")) >0:2740die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash.");27412742[upstream, settings] =findUpstreamBranchPoint()2743iflen(upstream) ==0:2744die("Cannot find upstream branchpoint for rebase")27452746# the branchpoint may be p4/foo~3, so strip off the parent2747 upstream = re.sub("~[0-9]+$","", upstream)27482749print"Rebasing the current branch onto%s"% upstream2750 oldHead =read_pipe("git rev-parse HEAD").strip()2751system("git rebase%s"% upstream)2752system("git diff-tree --stat --summary -M%sHEAD"% oldHead)2753return True27542755classP4Clone(P4Sync):2756def__init__(self):2757 P4Sync.__init__(self)2758 self.description ="Creates a new git repository and imports from Perforce into it"2759 self.usage ="usage: %prog [options] //depot/path[@revRange]"2760 self.options += [2761 optparse.make_option("--destination", dest="cloneDestination",2762 action='store', default=None,2763help="where to leave result of the clone"),2764 optparse.make_option("-/", dest="cloneExclude",2765 action="append",type="string",2766help="exclude depot path"),2767 optparse.make_option("--bare", dest="cloneBare",2768 action="store_true", default=False),2769]2770 self.cloneDestination =None2771 self.needsGit =False2772 self.cloneBare =False27732774# This is required for the "append" cloneExclude action2775defensure_value(self, attr, value):2776if nothasattr(self, attr)orgetattr(self, attr)is None:2777setattr(self, attr, value)2778returngetattr(self, attr)27792780defdefaultDestination(self, args):2781## TODO: use common prefix of args?2782 depotPath = args[0]2783 depotDir = re.sub("(@[^@]*)$","", depotPath)2784 depotDir = re.sub("(#[^#]*)$","", depotDir)2785 depotDir = re.sub(r"\.\.\.$","", depotDir)2786 depotDir = re.sub(r"/$","", depotDir)2787return os.path.split(depotDir)[1]27882789defrun(self, args):2790iflen(args) <1:2791return False27922793if self.keepRepoPath and not self.cloneDestination:2794 sys.stderr.write("Must specify destination for --keep-path\n")2795 sys.exit(1)27962797 depotPaths = args27982799if not self.cloneDestination andlen(depotPaths) >1:2800 self.cloneDestination = depotPaths[-1]2801 depotPaths = depotPaths[:-1]28022803 self.cloneExclude = ["/"+p for p in self.cloneExclude]2804for p in depotPaths:2805if not p.startswith("//"):2806return False28072808if not self.cloneDestination:2809 self.cloneDestination = self.defaultDestination(args)28102811print"Importing from%sinto%s"% (', '.join(depotPaths), self.cloneDestination)28122813if not os.path.exists(self.cloneDestination):2814 os.makedirs(self.cloneDestination)2815chdir(self.cloneDestination)28162817 init_cmd = ["git","init"]2818if self.cloneBare:2819 init_cmd.append("--bare")2820 subprocess.check_call(init_cmd)28212822if not P4Sync.run(self, depotPaths):2823return False2824if self.branch !="master":2825if self.importIntoRemotes:2826 masterbranch ="refs/remotes/p4/master"2827else:2828 masterbranch ="refs/heads/p4/master"2829ifgitBranchExists(masterbranch):2830system("git branch master%s"% masterbranch)2831if not self.cloneBare:2832system("git checkout -f")2833else:2834print"Could not detect main branch. No checkout/master branch created."28352836# auto-set this variable if invoked with --use-client-spec2837if self.useClientSpec_from_options:2838system("git config --bool git-p4.useclientspec true")28392840return True28412842classP4Branches(Command):2843def__init__(self):2844 Command.__init__(self)2845 self.options = [ ]2846 self.description = ("Shows the git branches that hold imports and their "2847+"corresponding perforce depot paths")2848 self.verbose =False28492850defrun(self, args):2851iforiginP4BranchesExist():2852createOrUpdateBranchesFromOrigin()28532854 cmdline ="git rev-parse --symbolic "2855 cmdline +=" --remotes"28562857for line inread_pipe_lines(cmdline):2858 line = line.strip()28592860if not line.startswith('p4/')or line =="p4/HEAD":2861continue2862 branch = line28632864 log =extractLogMessageFromGitCommit("refs/remotes/%s"% branch)2865 settings =extractSettingsGitLog(log)28662867print"%s<=%s(%s)"% (branch,",".join(settings["depot-paths"]), settings["change"])2868return True28692870classHelpFormatter(optparse.IndentedHelpFormatter):2871def__init__(self):2872 optparse.IndentedHelpFormatter.__init__(self)28732874defformat_description(self, description):2875if description:2876return description +"\n"2877else:2878return""28792880defprintUsage(commands):2881print"usage:%s<command> [options]"% sys.argv[0]2882print""2883print"valid commands:%s"%", ".join(commands)2884print""2885print"Try%s<command> --help for command specific help."% sys.argv[0]2886print""28872888commands = {2889"debug": P4Debug,2890"submit": P4Submit,2891"commit": P4Submit,2892"sync": P4Sync,2893"rebase": P4Rebase,2894"clone": P4Clone,2895"rollback": P4RollBack,2896"branches": P4Branches2897}289828992900defmain():2901iflen(sys.argv[1:]) ==0:2902printUsage(commands.keys())2903 sys.exit(2)29042905 cmd =""2906 cmdName = sys.argv[1]2907try:2908 klass = commands[cmdName]2909 cmd =klass()2910exceptKeyError:2911print"unknown command%s"% cmdName2912print""2913printUsage(commands.keys())2914 sys.exit(2)29152916 options = cmd.options2917 cmd.gitdir = os.environ.get("GIT_DIR",None)29182919 args = sys.argv[2:]29202921 options.append(optparse.make_option("--verbose", dest="verbose", action="store_true"))2922if cmd.needsGit:2923 options.append(optparse.make_option("--git-dir", dest="gitdir"))29242925 parser = optparse.OptionParser(cmd.usage.replace("%prog","%prog "+ cmdName),2926 options,2927 description = cmd.description,2928 formatter =HelpFormatter())29292930(cmd, args) = parser.parse_args(sys.argv[2:], cmd);2931global verbose2932 verbose = cmd.verbose2933if cmd.needsGit:2934if cmd.gitdir ==None:2935 cmd.gitdir = os.path.abspath(".git")2936if notisValidGitDir(cmd.gitdir):2937 cmd.gitdir =read_pipe("git rev-parse --git-dir").strip()2938if os.path.exists(cmd.gitdir):2939 cdup =read_pipe("git rev-parse --show-cdup").strip()2940iflen(cdup) >0:2941chdir(cdup);29422943if notisValidGitDir(cmd.gitdir):2944ifisValidGitDir(cmd.gitdir +"/.git"):2945 cmd.gitdir +="/.git"2946else:2947die("fatal: cannot locate git repository at%s"% cmd.gitdir)29482949 os.environ["GIT_DIR"] = cmd.gitdir29502951if not cmd.run(args):2952 parser.print_help()2953 sys.exit(2)295429552956if __name__ =='__main__':2957main()