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 123defp4_has_command(cmd): 124"""Ask p4 for help on this command. If it returns an error, the 125 command does not exist in this version of p4.""" 126 real_cmd =p4_build_cmd(["help", cmd]) 127 p = subprocess.Popen(real_cmd, stdout=subprocess.PIPE, 128 stderr=subprocess.PIPE) 129 p.communicate() 130return p.returncode ==0 131 132defsystem(cmd): 133 expand =isinstance(cmd,basestring) 134if verbose: 135 sys.stderr.write("executing%s\n"%str(cmd)) 136 subprocess.check_call(cmd, shell=expand) 137 138defp4_system(cmd): 139"""Specifically invoke p4 as the system command. """ 140 real_cmd =p4_build_cmd(cmd) 141 expand =isinstance(real_cmd, basestring) 142 subprocess.check_call(real_cmd, shell=expand) 143 144defp4_integrate(src, dest): 145p4_system(["integrate","-Dt",wildcard_encode(src),wildcard_encode(dest)]) 146 147defp4_sync(f, *options): 148p4_system(["sync"] +list(options) + [wildcard_encode(f)]) 149 150defp4_add(f): 151# forcibly add file names with wildcards 152ifwildcard_present(f): 153p4_system(["add","-f", f]) 154else: 155p4_system(["add", f]) 156 157defp4_delete(f): 158p4_system(["delete",wildcard_encode(f)]) 159 160defp4_edit(f): 161p4_system(["edit",wildcard_encode(f)]) 162 163defp4_revert(f): 164p4_system(["revert",wildcard_encode(f)]) 165 166defp4_reopen(type, f): 167p4_system(["reopen","-t",type,wildcard_encode(f)]) 168 169defp4_move(src, dest): 170p4_system(["move","-k",wildcard_encode(src),wildcard_encode(dest)]) 171 172# 173# Canonicalize the p4 type and return a tuple of the 174# base type, plus any modifiers. See "p4 help filetypes" 175# for a list and explanation. 176# 177defsplit_p4_type(p4type): 178 179 p4_filetypes_historical = { 180"ctempobj":"binary+Sw", 181"ctext":"text+C", 182"cxtext":"text+Cx", 183"ktext":"text+k", 184"kxtext":"text+kx", 185"ltext":"text+F", 186"tempobj":"binary+FSw", 187"ubinary":"binary+F", 188"uresource":"resource+F", 189"uxbinary":"binary+Fx", 190"xbinary":"binary+x", 191"xltext":"text+Fx", 192"xtempobj":"binary+Swx", 193"xtext":"text+x", 194"xunicode":"unicode+x", 195"xutf16":"utf16+x", 196} 197if p4type in p4_filetypes_historical: 198 p4type = p4_filetypes_historical[p4type] 199 mods ="" 200 s = p4type.split("+") 201 base = s[0] 202 mods ="" 203iflen(s) >1: 204 mods = s[1] 205return(base, mods) 206 207# 208# return the raw p4 type of a file (text, text+ko, etc) 209# 210defp4_type(file): 211 results =p4CmdList(["fstat","-T","headType",file]) 212return results[0]['headType'] 213 214# 215# Given a type base and modifier, return a regexp matching 216# the keywords that can be expanded in the file 217# 218defp4_keywords_regexp_for_type(base, type_mods): 219if base in("text","unicode","binary"): 220 kwords =None 221if"ko"in type_mods: 222 kwords ='Id|Header' 223elif"k"in type_mods: 224 kwords ='Id|Header|Author|Date|DateTime|Change|File|Revision' 225else: 226return None 227 pattern = r""" 228 \$ # Starts with a dollar, followed by... 229 (%s) # one of the keywords, followed by... 230 (:[^$]+)? # possibly an old expansion, followed by... 231 \$ # another dollar 232 """% kwords 233return pattern 234else: 235return None 236 237# 238# Given a file, return a regexp matching the possible 239# RCS keywords that will be expanded, or None for files 240# with kw expansion turned off. 241# 242defp4_keywords_regexp_for_file(file): 243if not os.path.exists(file): 244return None 245else: 246(type_base, type_mods) =split_p4_type(p4_type(file)) 247returnp4_keywords_regexp_for_type(type_base, type_mods) 248 249defsetP4ExecBit(file, mode): 250# Reopens an already open file and changes the execute bit to match 251# the execute bit setting in the passed in mode. 252 253 p4Type ="+x" 254 255if notisModeExec(mode): 256 p4Type =getP4OpenedType(file) 257 p4Type = re.sub('^([cku]?)x(.*)','\\1\\2', p4Type) 258 p4Type = re.sub('(.*?\+.*?)x(.*?)','\\1\\2', p4Type) 259if p4Type[-1] =="+": 260 p4Type = p4Type[0:-1] 261 262p4_reopen(p4Type,file) 263 264defgetP4OpenedType(file): 265# Returns the perforce file type for the given file. 266 267 result =p4_read_pipe(["opened",wildcard_encode(file)]) 268 match = re.match(".*\((.+)\)\r?$", result) 269if match: 270return match.group(1) 271else: 272die("Could not determine file type for%s(result: '%s')"% (file, result)) 273 274# Return the set of all p4 labels 275defgetP4Labels(depotPaths): 276 labels =set() 277ifisinstance(depotPaths,basestring): 278 depotPaths = [depotPaths] 279 280for l inp4CmdList(["labels"] + ["%s..."% p for p in depotPaths]): 281 label = l['label'] 282 labels.add(label) 283 284return labels 285 286# Return the set of all git tags 287defgetGitTags(): 288 gitTags =set() 289for line inread_pipe_lines(["git","tag"]): 290 tag = line.strip() 291 gitTags.add(tag) 292return gitTags 293 294defdiffTreePattern(): 295# This is a simple generator for the diff tree regex pattern. This could be 296# a class variable if this and parseDiffTreeEntry were a part of a class. 297 pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)') 298while True: 299yield pattern 300 301defparseDiffTreeEntry(entry): 302"""Parses a single diff tree entry into its component elements. 303 304 See git-diff-tree(1) manpage for details about the format of the diff 305 output. This method returns a dictionary with the following elements: 306 307 src_mode - The mode of the source file 308 dst_mode - The mode of the destination file 309 src_sha1 - The sha1 for the source file 310 dst_sha1 - The sha1 fr the destination file 311 status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc) 312 status_score - The score for the status (applicable for 'C' and 'R' 313 statuses). This is None if there is no score. 314 src - The path for the source file. 315 dst - The path for the destination file. This is only present for 316 copy or renames. If it is not present, this is None. 317 318 If the pattern is not matched, None is returned.""" 319 320 match =diffTreePattern().next().match(entry) 321if match: 322return{ 323'src_mode': match.group(1), 324'dst_mode': match.group(2), 325'src_sha1': match.group(3), 326'dst_sha1': match.group(4), 327'status': match.group(5), 328'status_score': match.group(6), 329'src': match.group(7), 330'dst': match.group(10) 331} 332return None 333 334defisModeExec(mode): 335# Returns True if the given git mode represents an executable file, 336# otherwise False. 337return mode[-3:] =="755" 338 339defisModeExecChanged(src_mode, dst_mode): 340returnisModeExec(src_mode) !=isModeExec(dst_mode) 341 342defp4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None): 343 344ifisinstance(cmd,basestring): 345 cmd ="-G "+ cmd 346 expand =True 347else: 348 cmd = ["-G"] + cmd 349 expand =False 350 351 cmd =p4_build_cmd(cmd) 352if verbose: 353 sys.stderr.write("Opening pipe:%s\n"%str(cmd)) 354 355# Use a temporary file to avoid deadlocks without 356# subprocess.communicate(), which would put another copy 357# of stdout into memory. 358 stdin_file =None 359if stdin is not None: 360 stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode) 361ifisinstance(stdin,basestring): 362 stdin_file.write(stdin) 363else: 364for i in stdin: 365 stdin_file.write(i +'\n') 366 stdin_file.flush() 367 stdin_file.seek(0) 368 369 p4 = subprocess.Popen(cmd, 370 shell=expand, 371 stdin=stdin_file, 372 stdout=subprocess.PIPE) 373 374 result = [] 375try: 376while True: 377 entry = marshal.load(p4.stdout) 378if cb is not None: 379cb(entry) 380else: 381 result.append(entry) 382exceptEOFError: 383pass 384 exitCode = p4.wait() 385if exitCode !=0: 386 entry = {} 387 entry["p4ExitCode"] = exitCode 388 result.append(entry) 389 390return result 391 392defp4Cmd(cmd): 393list=p4CmdList(cmd) 394 result = {} 395for entry inlist: 396 result.update(entry) 397return result; 398 399defp4Where(depotPath): 400if not depotPath.endswith("/"): 401 depotPath +="/" 402 depotPath = depotPath +"..." 403 outputList =p4CmdList(["where", depotPath]) 404 output =None 405for entry in outputList: 406if"depotFile"in entry: 407if entry["depotFile"] == depotPath: 408 output = entry 409break 410elif"data"in entry: 411 data = entry.get("data") 412 space = data.find(" ") 413if data[:space] == depotPath: 414 output = entry 415break 416if output ==None: 417return"" 418if output["code"] =="error": 419return"" 420 clientPath ="" 421if"path"in output: 422 clientPath = output.get("path") 423elif"data"in output: 424 data = output.get("data") 425 lastSpace = data.rfind(" ") 426 clientPath = data[lastSpace +1:] 427 428if clientPath.endswith("..."): 429 clientPath = clientPath[:-3] 430return clientPath 431 432defcurrentGitBranch(): 433returnread_pipe("git name-rev HEAD").split(" ")[1].strip() 434 435defisValidGitDir(path): 436if(os.path.exists(path +"/HEAD") 437and os.path.exists(path +"/refs")and os.path.exists(path +"/objects")): 438return True; 439return False 440 441defparseRevision(ref): 442returnread_pipe("git rev-parse%s"% ref).strip() 443 444defbranchExists(ref): 445 rev =read_pipe(["git","rev-parse","-q","--verify", ref], 446 ignore_error=True) 447returnlen(rev) >0 448 449defextractLogMessageFromGitCommit(commit): 450 logMessage ="" 451 452## fixme: title is first line of commit, not 1st paragraph. 453 foundTitle =False 454for log inread_pipe_lines("git cat-file commit%s"% commit): 455if not foundTitle: 456iflen(log) ==1: 457 foundTitle =True 458continue 459 460 logMessage += log 461return logMessage 462 463defextractSettingsGitLog(log): 464 values = {} 465for line in log.split("\n"): 466 line = line.strip() 467 m = re.search(r"^ *\[git-p4: (.*)\]$", line) 468if not m: 469continue 470 471 assignments = m.group(1).split(':') 472for a in assignments: 473 vals = a.split('=') 474 key = vals[0].strip() 475 val = ('='.join(vals[1:])).strip() 476if val.endswith('\"')and val.startswith('"'): 477 val = val[1:-1] 478 479 values[key] = val 480 481 paths = values.get("depot-paths") 482if not paths: 483 paths = values.get("depot-path") 484if paths: 485 values['depot-paths'] = paths.split(',') 486return values 487 488defgitBranchExists(branch): 489 proc = subprocess.Popen(["git","rev-parse", branch], 490 stderr=subprocess.PIPE, stdout=subprocess.PIPE); 491return proc.wait() ==0; 492 493_gitConfig = {} 494defgitConfig(key, args =None):# set args to "--bool", for instance 495if not _gitConfig.has_key(key): 496 argsFilter ="" 497if args !=None: 498 argsFilter ="%s"% args 499 cmd ="git config%s%s"% (argsFilter, key) 500 _gitConfig[key] =read_pipe(cmd, ignore_error=True).strip() 501return _gitConfig[key] 502 503defgitConfigList(key): 504if not _gitConfig.has_key(key): 505 _gitConfig[key] =read_pipe("git config --get-all%s"% key, ignore_error=True).strip().split(os.linesep) 506return _gitConfig[key] 507 508defp4BranchesInGit(branchesAreInRemotes =True): 509 branches = {} 510 511 cmdline ="git rev-parse --symbolic " 512if branchesAreInRemotes: 513 cmdline +=" --remotes" 514else: 515 cmdline +=" --branches" 516 517for line inread_pipe_lines(cmdline): 518 line = line.strip() 519 520## only import to p4/ 521if not line.startswith('p4/')or line =="p4/HEAD": 522continue 523 branch = line 524 525# strip off p4 526 branch = re.sub("^p4/","", line) 527 528 branches[branch] =parseRevision(line) 529return branches 530 531deffindUpstreamBranchPoint(head ="HEAD"): 532 branches =p4BranchesInGit() 533# map from depot-path to branch name 534 branchByDepotPath = {} 535for branch in branches.keys(): 536 tip = branches[branch] 537 log =extractLogMessageFromGitCommit(tip) 538 settings =extractSettingsGitLog(log) 539if settings.has_key("depot-paths"): 540 paths =",".join(settings["depot-paths"]) 541 branchByDepotPath[paths] ="remotes/p4/"+ branch 542 543 settings =None 544 parent =0 545while parent <65535: 546 commit = head +"~%s"% parent 547 log =extractLogMessageFromGitCommit(commit) 548 settings =extractSettingsGitLog(log) 549if settings.has_key("depot-paths"): 550 paths =",".join(settings["depot-paths"]) 551if branchByDepotPath.has_key(paths): 552return[branchByDepotPath[paths], settings] 553 554 parent = parent +1 555 556return["", settings] 557 558defcreateOrUpdateBranchesFromOrigin(localRefPrefix ="refs/remotes/p4/", silent=True): 559if not silent: 560print("Creating/updating branch(es) in%sbased on origin branch(es)" 561% localRefPrefix) 562 563 originPrefix ="origin/p4/" 564 565for line inread_pipe_lines("git rev-parse --symbolic --remotes"): 566 line = line.strip() 567if(not line.startswith(originPrefix))or line.endswith("HEAD"): 568continue 569 570 headName = line[len(originPrefix):] 571 remoteHead = localRefPrefix + headName 572 originHead = line 573 574 original =extractSettingsGitLog(extractLogMessageFromGitCommit(originHead)) 575if(not original.has_key('depot-paths') 576or not original.has_key('change')): 577continue 578 579 update =False 580if notgitBranchExists(remoteHead): 581if verbose: 582print"creating%s"% remoteHead 583 update =True 584else: 585 settings =extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead)) 586if settings.has_key('change') >0: 587if settings['depot-paths'] == original['depot-paths']: 588 originP4Change =int(original['change']) 589 p4Change =int(settings['change']) 590if originP4Change > p4Change: 591print("%s(%s) is newer than%s(%s). " 592"Updating p4 branch from origin." 593% (originHead, originP4Change, 594 remoteHead, p4Change)) 595 update =True 596else: 597print("Ignoring:%swas imported from%swhile " 598"%swas imported from%s" 599% (originHead,','.join(original['depot-paths']), 600 remoteHead,','.join(settings['depot-paths']))) 601 602if update: 603system("git update-ref%s %s"% (remoteHead, originHead)) 604 605deforiginP4BranchesExist(): 606returngitBranchExists("origin")orgitBranchExists("origin/p4")orgitBranchExists("origin/p4/master") 607 608defp4ChangesForPaths(depotPaths, changeRange): 609assert depotPaths 610 cmd = ['changes'] 611for p in depotPaths: 612 cmd += ["%s...%s"% (p, changeRange)] 613 output =p4_read_pipe_lines(cmd) 614 615 changes = {} 616for line in output: 617 changeNum =int(line.split(" ")[1]) 618 changes[changeNum] =True 619 620 changelist = changes.keys() 621 changelist.sort() 622return changelist 623 624defp4PathStartsWith(path, prefix): 625# This method tries to remedy a potential mixed-case issue: 626# 627# If UserA adds //depot/DirA/file1 628# and UserB adds //depot/dira/file2 629# 630# we may or may not have a problem. If you have core.ignorecase=true, 631# we treat DirA and dira as the same directory 632 ignorecase =gitConfig("core.ignorecase","--bool") =="true" 633if ignorecase: 634return path.lower().startswith(prefix.lower()) 635return path.startswith(prefix) 636 637defgetClientSpec(): 638"""Look at the p4 client spec, create a View() object that contains 639 all the mappings, and return it.""" 640 641 specList =p4CmdList("client -o") 642iflen(specList) !=1: 643die('Output from "client -o" is%dlines, expecting 1'% 644len(specList)) 645 646# dictionary of all client parameters 647 entry = specList[0] 648 649# just the keys that start with "View" 650 view_keys = [ k for k in entry.keys()if k.startswith("View") ] 651 652# hold this new View 653 view =View() 654 655# append the lines, in order, to the view 656for view_num inrange(len(view_keys)): 657 k ="View%d"% view_num 658if k not in view_keys: 659die("Expected view key%smissing"% k) 660 view.append(entry[k]) 661 662return view 663 664defgetClientRoot(): 665"""Grab the client directory.""" 666 667 output =p4CmdList("client -o") 668iflen(output) !=1: 669die('Output from "client -o" is%dlines, expecting 1'%len(output)) 670 671 entry = output[0] 672if"Root"not in entry: 673die('Client has no "Root"') 674 675return entry["Root"] 676 677# 678# P4 wildcards are not allowed in filenames. P4 complains 679# if you simply add them, but you can force it with "-f", in 680# which case it translates them into %xx encoding internally. 681# 682defwildcard_decode(path): 683# Search for and fix just these four characters. Do % last so 684# that fixing it does not inadvertently create new %-escapes. 685# Cannot have * in a filename in windows; untested as to 686# what p4 would do in such a case. 687if not platform.system() =="Windows": 688 path = path.replace("%2A","*") 689 path = path.replace("%23","#") \ 690.replace("%40","@") \ 691.replace("%25","%") 692return path 693 694defwildcard_encode(path): 695# do % first to avoid double-encoding the %s introduced here 696 path = path.replace("%","%25") \ 697.replace("*","%2A") \ 698.replace("#","%23") \ 699.replace("@","%40") 700return path 701 702defwildcard_present(path): 703return path.translate(None,"*#@%") != path 704 705class Command: 706def__init__(self): 707 self.usage ="usage: %prog [options]" 708 self.needsGit =True 709 self.verbose =False 710 711class P4UserMap: 712def__init__(self): 713 self.userMapFromPerforceServer =False 714 self.myP4UserId =None 715 716defp4UserId(self): 717if self.myP4UserId: 718return self.myP4UserId 719 720 results =p4CmdList("user -o") 721for r in results: 722if r.has_key('User'): 723 self.myP4UserId = r['User'] 724return r['User'] 725die("Could not find your p4 user id") 726 727defp4UserIsMe(self, p4User): 728# return True if the given p4 user is actually me 729 me = self.p4UserId() 730if not p4User or p4User != me: 731return False 732else: 733return True 734 735defgetUserCacheFilename(self): 736 home = os.environ.get("HOME", os.environ.get("USERPROFILE")) 737return home +"/.gitp4-usercache.txt" 738 739defgetUserMapFromPerforceServer(self): 740if self.userMapFromPerforceServer: 741return 742 self.users = {} 743 self.emails = {} 744 745for output inp4CmdList("users"): 746if not output.has_key("User"): 747continue 748 self.users[output["User"]] = output["FullName"] +" <"+ output["Email"] +">" 749 self.emails[output["Email"]] = output["User"] 750 751 752 s ='' 753for(key, val)in self.users.items(): 754 s +="%s\t%s\n"% (key.expandtabs(1), val.expandtabs(1)) 755 756open(self.getUserCacheFilename(),"wb").write(s) 757 self.userMapFromPerforceServer =True 758 759defloadUserMapFromCache(self): 760 self.users = {} 761 self.userMapFromPerforceServer =False 762try: 763 cache =open(self.getUserCacheFilename(),"rb") 764 lines = cache.readlines() 765 cache.close() 766for line in lines: 767 entry = line.strip().split("\t") 768 self.users[entry[0]] = entry[1] 769exceptIOError: 770 self.getUserMapFromPerforceServer() 771 772classP4Debug(Command): 773def__init__(self): 774 Command.__init__(self) 775 self.options = [] 776 self.description ="A tool to debug the output of p4 -G." 777 self.needsGit =False 778 779defrun(self, args): 780 j =0 781for output inp4CmdList(args): 782print'Element:%d'% j 783 j +=1 784print output 785return True 786 787classP4RollBack(Command): 788def__init__(self): 789 Command.__init__(self) 790 self.options = [ 791 optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true") 792] 793 self.description ="A tool to debug the multi-branch import. Don't use :)" 794 self.rollbackLocalBranches =False 795 796defrun(self, args): 797iflen(args) !=1: 798return False 799 maxChange =int(args[0]) 800 801if"p4ExitCode"inp4Cmd("changes -m 1"): 802die("Problems executing p4"); 803 804if self.rollbackLocalBranches: 805 refPrefix ="refs/heads/" 806 lines =read_pipe_lines("git rev-parse --symbolic --branches") 807else: 808 refPrefix ="refs/remotes/" 809 lines =read_pipe_lines("git rev-parse --symbolic --remotes") 810 811for line in lines: 812if self.rollbackLocalBranches or(line.startswith("p4/")and line !="p4/HEAD\n"): 813 line = line.strip() 814 ref = refPrefix + line 815 log =extractLogMessageFromGitCommit(ref) 816 settings =extractSettingsGitLog(log) 817 818 depotPaths = settings['depot-paths'] 819 change = settings['change'] 820 821 changed =False 822 823iflen(p4Cmd("changes -m 1 "+' '.join(['%s...@%s'% (p, maxChange) 824for p in depotPaths]))) ==0: 825print"Branch%sdid not exist at change%s, deleting."% (ref, maxChange) 826system("git update-ref -d%s`git rev-parse%s`"% (ref, ref)) 827continue 828 829while change andint(change) > maxChange: 830 changed =True 831if self.verbose: 832print"%sis at%s; rewinding towards%s"% (ref, change, maxChange) 833system("git update-ref%s\"%s^\""% (ref, ref)) 834 log =extractLogMessageFromGitCommit(ref) 835 settings =extractSettingsGitLog(log) 836 837 838 depotPaths = settings['depot-paths'] 839 change = settings['change'] 840 841if changed: 842print"%srewound to%s"% (ref, change) 843 844return True 845 846classP4Submit(Command, P4UserMap): 847def__init__(self): 848 Command.__init__(self) 849 P4UserMap.__init__(self) 850 self.options = [ 851 optparse.make_option("--origin", dest="origin"), 852 optparse.make_option("-M", dest="detectRenames", action="store_true"), 853# preserve the user, requires relevant p4 permissions 854 optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"), 855 optparse.make_option("--export-labels", dest="exportLabels", action="store_true"), 856] 857 self.description ="Submit changes from git to the perforce depot." 858 self.usage +=" [name of git branch to submit into perforce depot]" 859 self.interactive =True 860 self.origin ="" 861 self.detectRenames =False 862 self.preserveUser =gitConfig("git-p4.preserveUser").lower() =="true" 863 self.isWindows = (platform.system() =="Windows") 864 self.exportLabels =False 865 self.p4HasMoveCommand =p4_has_command("move") 866 867defcheck(self): 868iflen(p4CmdList("opened ...")) >0: 869die("You have files opened with perforce! Close them before starting the sync.") 870 871# replaces everything between 'Description:' and the next P4 submit template field with the 872# commit message 873defprepareLogMessage(self, template, message): 874 result ="" 875 876 inDescriptionSection =False 877 878for line in template.split("\n"): 879if line.startswith("#"): 880 result += line +"\n" 881continue 882 883if inDescriptionSection: 884if line.startswith("Files:")or line.startswith("Jobs:"): 885 inDescriptionSection =False 886else: 887continue 888else: 889if line.startswith("Description:"): 890 inDescriptionSection =True 891 line +="\n" 892for messageLine in message.split("\n"): 893 line +="\t"+ messageLine +"\n" 894 895 result += line +"\n" 896 897return result 898 899defpatchRCSKeywords(self,file, pattern): 900# Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern 901(handle, outFileName) = tempfile.mkstemp(dir='.') 902try: 903 outFile = os.fdopen(handle,"w+") 904 inFile =open(file,"r") 905 regexp = re.compile(pattern, re.VERBOSE) 906for line in inFile.readlines(): 907 line = regexp.sub(r'$\1$', line) 908 outFile.write(line) 909 inFile.close() 910 outFile.close() 911# Forcibly overwrite the original file 912 os.unlink(file) 913 shutil.move(outFileName,file) 914except: 915# cleanup our temporary file 916 os.unlink(outFileName) 917print"Failed to strip RCS keywords in%s"%file 918raise 919 920print"Patched up RCS keywords in%s"%file 921 922defp4UserForCommit(self,id): 923# Return the tuple (perforce user,git email) for a given git commit id 924 self.getUserMapFromPerforceServer() 925 gitEmail =read_pipe("git log --max-count=1 --format='%%ae'%s"%id) 926 gitEmail = gitEmail.strip() 927if not self.emails.has_key(gitEmail): 928return(None,gitEmail) 929else: 930return(self.emails[gitEmail],gitEmail) 931 932defcheckValidP4Users(self,commits): 933# check if any git authors cannot be mapped to p4 users 934foridin commits: 935(user,email) = self.p4UserForCommit(id) 936if not user: 937 msg ="Cannot find p4 user for email%sin commit%s."% (email,id) 938ifgitConfig('git-p4.allowMissingP4Users').lower() =="true": 939print"%s"% msg 940else: 941die("Error:%s\nSet git-p4.allowMissingP4Users to true to allow this."% msg) 942 943deflastP4Changelist(self): 944# Get back the last changelist number submitted in this client spec. This 945# then gets used to patch up the username in the change. If the same 946# client spec is being used by multiple processes then this might go 947# wrong. 948 results =p4CmdList("client -o")# find the current client 949 client =None 950for r in results: 951if r.has_key('Client'): 952 client = r['Client'] 953break 954if not client: 955die("could not get client spec") 956 results =p4CmdList(["changes","-c", client,"-m","1"]) 957for r in results: 958if r.has_key('change'): 959return r['change'] 960die("Could not get changelist number for last submit - cannot patch up user details") 961 962defmodifyChangelistUser(self, changelist, newUser): 963# fixup the user field of a changelist after it has been submitted. 964 changes =p4CmdList("change -o%s"% changelist) 965iflen(changes) !=1: 966die("Bad output from p4 change modifying%sto user%s"% 967(changelist, newUser)) 968 969 c = changes[0] 970if c['User'] == newUser:return# nothing to do 971 c['User'] = newUser 972input= marshal.dumps(c) 973 974 result =p4CmdList("change -f -i", stdin=input) 975for r in result: 976if r.has_key('code'): 977if r['code'] =='error': 978die("Could not modify user field of changelist%sto%s:%s"% (changelist, newUser, r['data'])) 979if r.has_key('data'): 980print("Updated user field for changelist%sto%s"% (changelist, newUser)) 981return 982die("Could not modify user field of changelist%sto%s"% (changelist, newUser)) 983 984defcanChangeChangelists(self): 985# check to see if we have p4 admin or super-user permissions, either of 986# which are required to modify changelists. 987 results =p4CmdList(["protects", self.depotPath]) 988for r in results: 989if r.has_key('perm'): 990if r['perm'] =='admin': 991return1 992if r['perm'] =='super': 993return1 994return0 995 996defprepareSubmitTemplate(self): 997# remove lines in the Files section that show changes to files outside the depot path we're committing into 998 template ="" 999 inFilesSection =False1000for line inp4_read_pipe_lines(['change','-o']):1001if line.endswith("\r\n"):1002 line = line[:-2] +"\n"1003if inFilesSection:1004if line.startswith("\t"):1005# path starts and ends with a tab1006 path = line[1:]1007 lastTab = path.rfind("\t")1008if lastTab != -1:1009 path = path[:lastTab]1010if notp4PathStartsWith(path, self.depotPath):1011continue1012else:1013 inFilesSection =False1014else:1015if line.startswith("Files:"):1016 inFilesSection =True10171018 template += line10191020return template10211022defedit_template(self, template_file):1023"""Invoke the editor to let the user change the submission1024 message. Return true if okay to continue with the submit."""10251026# if configured to skip the editing part, just submit1027ifgitConfig("git-p4.skipSubmitEdit") =="true":1028return True10291030# look at the modification time, to check later if the user saved1031# the file1032 mtime = os.stat(template_file).st_mtime10331034# invoke the editor1035if os.environ.has_key("P4EDITOR")and(os.environ.get("P4EDITOR") !=""):1036 editor = os.environ.get("P4EDITOR")1037else:1038 editor =read_pipe("git var GIT_EDITOR").strip()1039system(editor +" "+ template_file)10401041# If the file was not saved, prompt to see if this patch should1042# be skipped. But skip this verification step if configured so.1043ifgitConfig("git-p4.skipSubmitEditCheck") =="true":1044return True10451046# modification time updated means user saved the file1047if os.stat(template_file).st_mtime > mtime:1048return True10491050while True:1051 response =raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")1052if response =='y':1053return True1054if response =='n':1055return False10561057defapplyCommit(self,id):1058print"Applying%s"% (read_pipe("git log --max-count=1 --pretty=oneline%s"%id))10591060(p4User, gitEmail) = self.p4UserForCommit(id)10611062 diff =read_pipe_lines("git diff-tree -r%s\"%s^\" \"%s\""% (self.diffOpts,id,id))1063 filesToAdd =set()1064 filesToDelete =set()1065 editedFiles =set()1066 pureRenameCopy =set()1067 filesToChangeExecBit = {}10681069for line in diff:1070 diff =parseDiffTreeEntry(line)1071 modifier = diff['status']1072 path = diff['src']1073if modifier =="M":1074p4_edit(path)1075ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1076 filesToChangeExecBit[path] = diff['dst_mode']1077 editedFiles.add(path)1078elif modifier =="A":1079 filesToAdd.add(path)1080 filesToChangeExecBit[path] = diff['dst_mode']1081if path in filesToDelete:1082 filesToDelete.remove(path)1083elif modifier =="D":1084 filesToDelete.add(path)1085if path in filesToAdd:1086 filesToAdd.remove(path)1087elif modifier =="C":1088 src, dest = diff['src'], diff['dst']1089p4_integrate(src, dest)1090 pureRenameCopy.add(dest)1091if diff['src_sha1'] != diff['dst_sha1']:1092p4_edit(dest)1093 pureRenameCopy.discard(dest)1094ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1095p4_edit(dest)1096 pureRenameCopy.discard(dest)1097 filesToChangeExecBit[dest] = diff['dst_mode']1098 os.unlink(dest)1099 editedFiles.add(dest)1100elif modifier =="R":1101 src, dest = diff['src'], diff['dst']1102if self.p4HasMoveCommand:1103p4_edit(src)# src must be open before move1104p4_move(src, dest)# opens for (move/delete, move/add)1105else:1106p4_integrate(src, dest)1107if diff['src_sha1'] != diff['dst_sha1']:1108p4_edit(dest)1109else:1110 pureRenameCopy.add(dest)1111ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1112if not self.p4HasMoveCommand:1113p4_edit(dest)# with move: already open, writable1114 filesToChangeExecBit[dest] = diff['dst_mode']1115if not self.p4HasMoveCommand:1116 os.unlink(dest)1117 filesToDelete.add(src)1118 editedFiles.add(dest)1119else:1120die("unknown modifier%sfor%s"% (modifier, path))11211122 diffcmd ="git format-patch -k --stdout\"%s^\"..\"%s\""% (id,id)1123 patchcmd = diffcmd +" | git apply "1124 tryPatchCmd = patchcmd +"--check -"1125 applyPatchCmd = patchcmd +"--check --apply -"1126 patch_succeeded =True11271128if os.system(tryPatchCmd) !=0:1129 fixed_rcs_keywords =False1130 patch_succeeded =False1131print"Unfortunately applying the change failed!"11321133# Patch failed, maybe it's just RCS keyword woes. Look through1134# the patch to see if that's possible.1135ifgitConfig("git-p4.attemptRCSCleanup","--bool") =="true":1136file=None1137 pattern =None1138 kwfiles = {}1139forfilein editedFiles | filesToDelete:1140# did this file's delta contain RCS keywords?1141 pattern =p4_keywords_regexp_for_file(file)11421143if pattern:1144# this file is a possibility...look for RCS keywords.1145 regexp = re.compile(pattern, re.VERBOSE)1146for line inread_pipe_lines(["git","diff","%s^..%s"% (id,id),file]):1147if regexp.search(line):1148if verbose:1149print"got keyword match on%sin%sin%s"% (pattern, line,file)1150 kwfiles[file] = pattern1151break11521153forfilein kwfiles:1154if verbose:1155print"zapping%swith%s"% (line,pattern)1156 self.patchRCSKeywords(file, kwfiles[file])1157 fixed_rcs_keywords =True11581159if fixed_rcs_keywords:1160print"Retrying the patch with RCS keywords cleaned up"1161if os.system(tryPatchCmd) ==0:1162 patch_succeeded =True11631164if not patch_succeeded:1165print"What do you want to do?"1166 response ="x"1167while response !="s"and response !="a"and response !="w":1168 response =raw_input("[s]kip this patch / [a]pply the patch forcibly "1169"and with .rej files / [w]rite the patch to a file (patch.txt) ")1170if response =="s":1171print"Skipping! Good luck with the next patches..."1172for f in editedFiles:1173p4_revert(f)1174for f in filesToAdd:1175 os.remove(f)1176return1177elif response =="a":1178 os.system(applyPatchCmd)1179iflen(filesToAdd) >0:1180print"You may also want to call p4 add on the following files:"1181print" ".join(filesToAdd)1182iflen(filesToDelete):1183print"The following files should be scheduled for deletion with p4 delete:"1184print" ".join(filesToDelete)1185die("Please resolve and submit the conflict manually and "1186+"continue afterwards with git p4 submit --continue")1187elif response =="w":1188system(diffcmd +" > patch.txt")1189print"Patch saved to patch.txt in%s!"% self.clientPath1190die("Please resolve and submit the conflict manually and "1191"continue afterwards with git p4 submit --continue")11921193system(applyPatchCmd)11941195for f in filesToAdd:1196p4_add(f)1197for f in filesToDelete:1198p4_revert(f)1199p4_delete(f)12001201# Set/clear executable bits1202for f in filesToChangeExecBit.keys():1203 mode = filesToChangeExecBit[f]1204setP4ExecBit(f, mode)12051206 logMessage =extractLogMessageFromGitCommit(id)1207 logMessage = logMessage.strip()12081209 template = self.prepareSubmitTemplate()12101211if self.interactive:1212 submitTemplate = self.prepareLogMessage(template, logMessage)12131214if self.preserveUser:1215 submitTemplate = submitTemplate + ("\n######## Actual user%s, modified after commit\n"% p4User)12161217if os.environ.has_key("P4DIFF"):1218del(os.environ["P4DIFF"])1219 diff =""1220for editedFile in editedFiles:1221 diff +=p4_read_pipe(['diff','-du',1222wildcard_encode(editedFile)])12231224 newdiff =""1225for newFile in filesToAdd:1226 newdiff +="==== new file ====\n"1227 newdiff +="--- /dev/null\n"1228 newdiff +="+++%s\n"% newFile1229 f =open(newFile,"r")1230for line in f.readlines():1231 newdiff +="+"+ line1232 f.close()12331234if self.checkAuthorship and not self.p4UserIsMe(p4User):1235 submitTemplate +="######## git author%sdoes not match your p4 account.\n"% gitEmail1236 submitTemplate +="######## Use option --preserve-user to modify authorship.\n"1237 submitTemplate +="######## Variable git-p4.skipUserNameCheck hides this message.\n"12381239 separatorLine ="######## everything below this line is just the diff #######\n"12401241(handle, fileName) = tempfile.mkstemp()1242 tmpFile = os.fdopen(handle,"w+")1243if self.isWindows:1244 submitTemplate = submitTemplate.replace("\n","\r\n")1245 separatorLine = separatorLine.replace("\n","\r\n")1246 newdiff = newdiff.replace("\n","\r\n")1247 tmpFile.write(submitTemplate + separatorLine + diff + newdiff)1248 tmpFile.close()12491250if self.edit_template(fileName):1251# read the edited message and submit1252 tmpFile =open(fileName,"rb")1253 message = tmpFile.read()1254 tmpFile.close()1255 submitTemplate = message[:message.index(separatorLine)]1256if self.isWindows:1257 submitTemplate = submitTemplate.replace("\r\n","\n")1258p4_write_pipe(['submit','-i'], submitTemplate)12591260if self.preserveUser:1261if p4User:1262# Get last changelist number. Cannot easily get it from1263# the submit command output as the output is1264# unmarshalled.1265 changelist = self.lastP4Changelist()1266 self.modifyChangelistUser(changelist, p4User)12671268# The rename/copy happened by applying a patch that created a1269# new file. This leaves it writable, which confuses p4.1270for f in pureRenameCopy:1271p4_sync(f,"-f")12721273else:1274# skip this patch1275print"Submission cancelled, undoing p4 changes."1276for f in editedFiles:1277p4_revert(f)1278for f in filesToAdd:1279p4_revert(f)1280 os.remove(f)12811282 os.remove(fileName)1283else:1284 fileName ="submit.txt"1285file=open(fileName,"w+")1286file.write(self.prepareLogMessage(template, logMessage))1287file.close()1288print("Perforce submit template written as%s. "1289+"Please review/edit and then use p4 submit -i <%sto submit directly!"1290% (fileName, fileName))12911292# Export git tags as p4 labels. Create a p4 label and then tag1293# with that.1294defexportGitTags(self, gitTags):1295 validLabelRegexp =gitConfig("git-p4.labelExportRegexp")1296iflen(validLabelRegexp) ==0:1297 validLabelRegexp = defaultLabelRegexp1298 m = re.compile(validLabelRegexp)12991300for name in gitTags:13011302if not m.match(name):1303if verbose:1304print"tag%sdoes not match regexp%s"% (name, validLabelRegexp)1305continue13061307# Get the p4 commit this corresponds to1308 logMessage =extractLogMessageFromGitCommit(name)1309 values =extractSettingsGitLog(logMessage)13101311if not values.has_key('change'):1312# a tag pointing to something not sent to p4; ignore1313if verbose:1314print"git tag%sdoes not give a p4 commit"% name1315continue1316else:1317 changelist = values['change']13181319# Get the tag details.1320 inHeader =True1321 isAnnotated =False1322 body = []1323for l inread_pipe_lines(["git","cat-file","-p", name]):1324 l = l.strip()1325if inHeader:1326if re.match(r'tag\s+', l):1327 isAnnotated =True1328elif re.match(r'\s*$', l):1329 inHeader =False1330continue1331else:1332 body.append(l)13331334if not isAnnotated:1335 body = ["lightweight tag imported by git p4\n"]13361337# Create the label - use the same view as the client spec we are using1338 clientSpec =getClientSpec()13391340 labelTemplate ="Label:%s\n"% name1341 labelTemplate +="Description:\n"1342for b in body:1343 labelTemplate +="\t"+ b +"\n"1344 labelTemplate +="View:\n"1345for mapping in clientSpec.mappings:1346 labelTemplate +="\t%s\n"% mapping.depot_side.path13471348p4_write_pipe(["label","-i"], labelTemplate)13491350# Use the label1351p4_system(["tag","-l", name] +1352["%s@%s"% (mapping.depot_side.path, changelist)for mapping in clientSpec.mappings])13531354if verbose:1355print"created p4 label for tag%s"% name13561357defrun(self, args):1358iflen(args) ==0:1359 self.master =currentGitBranch()1360iflen(self.master) ==0or notgitBranchExists("refs/heads/%s"% self.master):1361die("Detecting current git branch failed!")1362eliflen(args) ==1:1363 self.master = args[0]1364if notbranchExists(self.master):1365die("Branch%sdoes not exist"% self.master)1366else:1367return False13681369 allowSubmit =gitConfig("git-p4.allowSubmit")1370iflen(allowSubmit) >0and not self.master in allowSubmit.split(","):1371die("%sis not in git-p4.allowSubmit"% self.master)13721373[upstream, settings] =findUpstreamBranchPoint()1374 self.depotPath = settings['depot-paths'][0]1375iflen(self.origin) ==0:1376 self.origin = upstream13771378if self.preserveUser:1379if not self.canChangeChangelists():1380die("Cannot preserve user names without p4 super-user or admin permissions")13811382if self.verbose:1383print"Origin branch is "+ self.origin13841385iflen(self.depotPath) ==0:1386print"Internal error: cannot locate perforce depot path from existing branches"1387 sys.exit(128)13881389 self.useClientSpec =False1390ifgitConfig("git-p4.useclientspec","--bool") =="true":1391 self.useClientSpec =True1392if self.useClientSpec:1393 self.clientSpecDirs =getClientSpec()13941395if self.useClientSpec:1396# all files are relative to the client spec1397 self.clientPath =getClientRoot()1398else:1399 self.clientPath =p4Where(self.depotPath)14001401if self.clientPath =="":1402die("Error: Cannot locate perforce checkout of%sin client view"% self.depotPath)14031404print"Perforce checkout for depot path%slocated at%s"% (self.depotPath, self.clientPath)1405 self.oldWorkingDirectory = os.getcwd()14061407# ensure the clientPath exists1408 new_client_dir =False1409if not os.path.exists(self.clientPath):1410 new_client_dir =True1411 os.makedirs(self.clientPath)14121413chdir(self.clientPath)1414print"Synchronizing p4 checkout..."1415if new_client_dir:1416# old one was destroyed, and maybe nobody told p41417p4_sync("...","-f")1418else:1419p4_sync("...")1420 self.check()14211422 commits = []1423for line inread_pipe_lines("git rev-list --no-merges%s..%s"% (self.origin, self.master)):1424 commits.append(line.strip())1425 commits.reverse()14261427if self.preserveUser or(gitConfig("git-p4.skipUserNameCheck") =="true"):1428 self.checkAuthorship =False1429else:1430 self.checkAuthorship =True14311432if self.preserveUser:1433 self.checkValidP4Users(commits)14341435#1436# Build up a set of options to be passed to diff when1437# submitting each commit to p4.1438#1439if self.detectRenames:1440# command-line -M arg1441 self.diffOpts ="-M"1442else:1443# If not explicitly set check the config variable1444 detectRenames =gitConfig("git-p4.detectRenames")14451446if detectRenames.lower() =="false"or detectRenames =="":1447 self.diffOpts =""1448elif detectRenames.lower() =="true":1449 self.diffOpts ="-M"1450else:1451 self.diffOpts ="-M%s"% detectRenames14521453# no command-line arg for -C or --find-copies-harder, just1454# config variables1455 detectCopies =gitConfig("git-p4.detectCopies")1456if detectCopies.lower() =="false"or detectCopies =="":1457pass1458elif detectCopies.lower() =="true":1459 self.diffOpts +=" -C"1460else:1461 self.diffOpts +=" -C%s"% detectCopies14621463ifgitConfig("git-p4.detectCopiesHarder","--bool") =="true":1464 self.diffOpts +=" --find-copies-harder"14651466whilelen(commits) >0:1467 commit = commits[0]1468 commits = commits[1:]1469 self.applyCommit(commit)1470if not self.interactive:1471break14721473iflen(commits) ==0:1474print"All changes applied!"1475chdir(self.oldWorkingDirectory)14761477 sync =P4Sync()1478 sync.run([])14791480 rebase =P4Rebase()1481 rebase.rebase()14821483ifgitConfig("git-p4.exportLabels","--bool") =="true":1484 self.exportLabels =True14851486if self.exportLabels:1487 p4Labels =getP4Labels(self.depotPath)1488 gitTags =getGitTags()14891490 missingGitTags = gitTags - p4Labels1491 self.exportGitTags(missingGitTags)14921493return True14941495classView(object):1496"""Represent a p4 view ("p4 help views"), and map files in a1497 repo according to the view."""14981499classPath(object):1500"""A depot or client path, possibly containing wildcards.1501 The only one supported is ... at the end, currently.1502 Initialize with the full path, with //depot or //client."""15031504def__init__(self, path, is_depot):1505 self.path = path1506 self.is_depot = is_depot1507 self.find_wildcards()1508# remember the prefix bit, useful for relative mappings1509 m = re.match("(//[^/]+/)", self.path)1510if not m:1511die("Path%sdoes not start with //prefix/"% self.path)1512 prefix = m.group(1)1513if not self.is_depot:1514# strip //client/ on client paths1515 self.path = self.path[len(prefix):]15161517deffind_wildcards(self):1518"""Make sure wildcards are valid, and set up internal1519 variables."""15201521 self.ends_triple_dot =False1522# There are three wildcards allowed in p4 views1523# (see "p4 help views"). This code knows how to1524# handle "..." (only at the end), but cannot deal with1525# "%%n" or "*". Only check the depot_side, as p4 should1526# validate that the client_side matches too.1527if re.search(r'%%[1-9]', self.path):1528die("Can't handle%%n wildcards in view:%s"% self.path)1529if self.path.find("*") >=0:1530die("Can't handle * wildcards in view:%s"% self.path)1531 triple_dot_index = self.path.find("...")1532if triple_dot_index >=0:1533if triple_dot_index !=len(self.path) -3:1534die("Can handle only single ... wildcard, at end:%s"%1535 self.path)1536 self.ends_triple_dot =True15371538defensure_compatible(self, other_path):1539"""Make sure the wildcards agree."""1540if self.ends_triple_dot != other_path.ends_triple_dot:1541die("Both paths must end with ... if either does;\n"+1542"paths:%s %s"% (self.path, other_path.path))15431544defmatch_wildcards(self, test_path):1545"""See if this test_path matches us, and fill in the value1546 of the wildcards if so. Returns a tuple of1547 (True|False, wildcards[]). For now, only the ... at end1548 is supported, so at most one wildcard."""1549if self.ends_triple_dot:1550 dotless = self.path[:-3]1551if test_path.startswith(dotless):1552 wildcard = test_path[len(dotless):]1553return(True, [ wildcard ])1554else:1555if test_path == self.path:1556return(True, [])1557return(False, [])15581559defmatch(self, test_path):1560"""Just return if it matches; don't bother with the wildcards."""1561 b, _ = self.match_wildcards(test_path)1562return b15631564deffill_in_wildcards(self, wildcards):1565"""Return the relative path, with the wildcards filled in1566 if there are any."""1567if self.ends_triple_dot:1568return self.path[:-3] + wildcards[0]1569else:1570return self.path15711572classMapping(object):1573def__init__(self, depot_side, client_side, overlay, exclude):1574# depot_side is without the trailing /... if it had one1575 self.depot_side = View.Path(depot_side, is_depot=True)1576 self.client_side = View.Path(client_side, is_depot=False)1577 self.overlay = overlay # started with "+"1578 self.exclude = exclude # started with "-"1579assert not(self.overlay and self.exclude)1580 self.depot_side.ensure_compatible(self.client_side)15811582def__str__(self):1583 c =" "1584if self.overlay:1585 c ="+"1586if self.exclude:1587 c ="-"1588return"View.Mapping:%s%s->%s"% \1589(c, self.depot_side.path, self.client_side.path)15901591defmap_depot_to_client(self, depot_path):1592"""Calculate the client path if using this mapping on the1593 given depot path; does not consider the effect of other1594 mappings in a view. Even excluded mappings are returned."""1595 matches, wildcards = self.depot_side.match_wildcards(depot_path)1596if not matches:1597return""1598 client_path = self.client_side.fill_in_wildcards(wildcards)1599return client_path16001601#1602# View methods1603#1604def__init__(self):1605 self.mappings = []16061607defappend(self, view_line):1608"""Parse a view line, splitting it into depot and client1609 sides. Append to self.mappings, preserving order."""16101611# Split the view line into exactly two words. P4 enforces1612# structure on these lines that simplifies this quite a bit.1613#1614# Either or both words may be double-quoted.1615# Single quotes do not matter.1616# Double-quote marks cannot occur inside the words.1617# A + or - prefix is also inside the quotes.1618# There are no quotes unless they contain a space.1619# The line is already white-space stripped.1620# The two words are separated by a single space.1621#1622if view_line[0] =='"':1623# First word is double quoted. Find its end.1624 close_quote_index = view_line.find('"',1)1625if close_quote_index <=0:1626die("No first-word closing quote found:%s"% view_line)1627 depot_side = view_line[1:close_quote_index]1628# skip closing quote and space1629 rhs_index = close_quote_index +1+11630else:1631 space_index = view_line.find(" ")1632if space_index <=0:1633die("No word-splitting space found:%s"% view_line)1634 depot_side = view_line[0:space_index]1635 rhs_index = space_index +116361637if view_line[rhs_index] =='"':1638# Second word is double quoted. Make sure there is a1639# double quote at the end too.1640if not view_line.endswith('"'):1641die("View line with rhs quote should end with one:%s"%1642 view_line)1643# skip the quotes1644 client_side = view_line[rhs_index+1:-1]1645else:1646 client_side = view_line[rhs_index:]16471648# prefix + means overlay on previous mapping1649 overlay =False1650if depot_side.startswith("+"):1651 overlay =True1652 depot_side = depot_side[1:]16531654# prefix - means exclude this path1655 exclude =False1656if depot_side.startswith("-"):1657 exclude =True1658 depot_side = depot_side[1:]16591660 m = View.Mapping(depot_side, client_side, overlay, exclude)1661 self.mappings.append(m)16621663defmap_in_client(self, depot_path):1664"""Return the relative location in the client where this1665 depot file should live. Returns "" if the file should1666 not be mapped in the client."""16671668 paths_filled = []1669 client_path =""16701671# look at later entries first1672for m in self.mappings[::-1]:16731674# see where will this path end up in the client1675 p = m.map_depot_to_client(depot_path)16761677if p =="":1678# Depot path does not belong in client. Must remember1679# this, as previous items should not cause files to1680# exist in this path either. Remember that the list is1681# being walked from the end, which has higher precedence.1682# Overlap mappings do not exclude previous mappings.1683if not m.overlay:1684 paths_filled.append(m.client_side)16851686else:1687# This mapping matched; no need to search any further.1688# But, the mapping could be rejected if the client path1689# has already been claimed by an earlier mapping (i.e.1690# one later in the list, which we are walking backwards).1691 already_mapped_in_client =False1692for f in paths_filled:1693# this is View.Path.match1694if f.match(p):1695 already_mapped_in_client =True1696break1697if not already_mapped_in_client:1698# Include this file, unless it is from a line that1699# explicitly said to exclude it.1700if not m.exclude:1701 client_path = p17021703# a match, even if rejected, always stops the search1704break17051706return client_path17071708classP4Sync(Command, P4UserMap):1709 delete_actions = ("delete","move/delete","purge")17101711def__init__(self):1712 Command.__init__(self)1713 P4UserMap.__init__(self)1714 self.options = [1715 optparse.make_option("--branch", dest="branch"),1716 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),1717 optparse.make_option("--changesfile", dest="changesFile"),1718 optparse.make_option("--silent", dest="silent", action="store_true"),1719 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),1720 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),1721 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",1722help="Import into refs/heads/ , not refs/remotes"),1723 optparse.make_option("--max-changes", dest="maxChanges"),1724 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',1725help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),1726 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',1727help="Only sync files that are included in the Perforce Client Spec")1728]1729 self.description ="""Imports from Perforce into a git repository.\n1730 example:1731 //depot/my/project/ -- to import the current head1732 //depot/my/project/@all -- to import everything1733 //depot/my/project/@1,6 -- to import only from revision 1 to 617341735 (a ... is not needed in the path p4 specification, it's added implicitly)"""17361737 self.usage +=" //depot/path[@revRange]"1738 self.silent =False1739 self.createdBranches =set()1740 self.committedChanges =set()1741 self.branch =""1742 self.detectBranches =False1743 self.detectLabels =False1744 self.importLabels =False1745 self.changesFile =""1746 self.syncWithOrigin =True1747 self.importIntoRemotes =True1748 self.maxChanges =""1749 self.isWindows = (platform.system() =="Windows")1750 self.keepRepoPath =False1751 self.depotPaths =None1752 self.p4BranchesInGit = []1753 self.cloneExclude = []1754 self.useClientSpec =False1755 self.useClientSpec_from_options =False1756 self.clientSpecDirs =None1757 self.tempBranches = []1758 self.tempBranchLocation ="git-p4-tmp"17591760ifgitConfig("git-p4.syncFromOrigin") =="false":1761 self.syncWithOrigin =False17621763# Force a checkpoint in fast-import and wait for it to finish1764defcheckpoint(self):1765 self.gitStream.write("checkpoint\n\n")1766 self.gitStream.write("progress checkpoint\n\n")1767 out = self.gitOutput.readline()1768if self.verbose:1769print"checkpoint finished: "+ out17701771defextractFilesFromCommit(self, commit):1772 self.cloneExclude = [re.sub(r"\.\.\.$","", path)1773for path in self.cloneExclude]1774 files = []1775 fnum =01776while commit.has_key("depotFile%s"% fnum):1777 path = commit["depotFile%s"% fnum]17781779if[p for p in self.cloneExclude1780ifp4PathStartsWith(path, p)]:1781 found =False1782else:1783 found = [p for p in self.depotPaths1784ifp4PathStartsWith(path, p)]1785if not found:1786 fnum = fnum +11787continue17881789file= {}1790file["path"] = path1791file["rev"] = commit["rev%s"% fnum]1792file["action"] = commit["action%s"% fnum]1793file["type"] = commit["type%s"% fnum]1794 files.append(file)1795 fnum = fnum +11796return files17971798defstripRepoPath(self, path, prefixes):1799if self.useClientSpec:1800return self.clientSpecDirs.map_in_client(path)18011802if self.keepRepoPath:1803 prefixes = [re.sub("^(//[^/]+/).*", r'\1', prefixes[0])]18041805for p in prefixes:1806ifp4PathStartsWith(path, p):1807 path = path[len(p):]18081809return path18101811defsplitFilesIntoBranches(self, commit):1812 branches = {}1813 fnum =01814while commit.has_key("depotFile%s"% fnum):1815 path = commit["depotFile%s"% fnum]1816 found = [p for p in self.depotPaths1817ifp4PathStartsWith(path, p)]1818if not found:1819 fnum = fnum +11820continue18211822file= {}1823file["path"] = path1824file["rev"] = commit["rev%s"% fnum]1825file["action"] = commit["action%s"% fnum]1826file["type"] = commit["type%s"% fnum]1827 fnum = fnum +118281829 relPath = self.stripRepoPath(path, self.depotPaths)1830 relPath =wildcard_decode(relPath)18311832for branch in self.knownBranches.keys():18331834# add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.21835if relPath.startswith(branch +"/"):1836if branch not in branches:1837 branches[branch] = []1838 branches[branch].append(file)1839break18401841return branches18421843# output one file from the P4 stream1844# - helper for streamP4Files18451846defstreamOneP4File(self,file, contents):1847 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)1848 relPath =wildcard_decode(relPath)1849if verbose:1850 sys.stderr.write("%s\n"% relPath)18511852(type_base, type_mods) =split_p4_type(file["type"])18531854 git_mode ="100644"1855if"x"in type_mods:1856 git_mode ="100755"1857if type_base =="symlink":1858 git_mode ="120000"1859# p4 print on a symlink contains "target\n"; remove the newline1860 data =''.join(contents)1861 contents = [data[:-1]]18621863if type_base =="utf16":1864# p4 delivers different text in the python output to -G1865# than it does when using "print -o", or normal p4 client1866# operations. utf16 is converted to ascii or utf8, perhaps.1867# But ascii text saved as -t utf16 is completely mangled.1868# Invoke print -o to get the real contents.1869 text =p4_read_pipe(['print','-q','-o','-',file['depotFile']])1870 contents = [ text ]18711872if type_base =="apple":1873# Apple filetype files will be streamed as a concatenation of1874# its appledouble header and the contents. This is useless1875# on both macs and non-macs. If using "print -q -o xx", it1876# will create "xx" with the data, and "%xx" with the header.1877# This is also not very useful.1878#1879# Ideally, someday, this script can learn how to generate1880# appledouble files directly and import those to git, but1881# non-mac machines can never find a use for apple filetype.1882print"\nIgnoring apple filetype file%s"%file['depotFile']1883return18841885# Perhaps windows wants unicode, utf16 newlines translated too;1886# but this is not doing it.1887if self.isWindows and type_base =="text":1888 mangled = []1889for data in contents:1890 data = data.replace("\r\n","\n")1891 mangled.append(data)1892 contents = mangled18931894# Note that we do not try to de-mangle keywords on utf16 files,1895# even though in theory somebody may want that.1896 pattern =p4_keywords_regexp_for_type(type_base, type_mods)1897if pattern:1898 regexp = re.compile(pattern, re.VERBOSE)1899 text =''.join(contents)1900 text = regexp.sub(r'$\1$', text)1901 contents = [ text ]19021903 self.gitStream.write("M%sinline%s\n"% (git_mode, relPath))19041905# total length...1906 length =01907for d in contents:1908 length = length +len(d)19091910 self.gitStream.write("data%d\n"% length)1911for d in contents:1912 self.gitStream.write(d)1913 self.gitStream.write("\n")19141915defstreamOneP4Deletion(self,file):1916 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)1917 relPath =wildcard_decode(relPath)1918if verbose:1919 sys.stderr.write("delete%s\n"% relPath)1920 self.gitStream.write("D%s\n"% relPath)19211922# handle another chunk of streaming data1923defstreamP4FilesCb(self, marshalled):19241925if marshalled.has_key('depotFile')and self.stream_have_file_info:1926# start of a new file - output the old one first1927 self.streamOneP4File(self.stream_file, self.stream_contents)1928 self.stream_file = {}1929 self.stream_contents = []1930 self.stream_have_file_info =False19311932# pick up the new file information... for the1933# 'data' field we need to append to our array1934for k in marshalled.keys():1935if k =='data':1936 self.stream_contents.append(marshalled['data'])1937else:1938 self.stream_file[k] = marshalled[k]19391940 self.stream_have_file_info =True19411942# Stream directly from "p4 files" into "git fast-import"1943defstreamP4Files(self, files):1944 filesForCommit = []1945 filesToRead = []1946 filesToDelete = []19471948for f in files:1949# if using a client spec, only add the files that have1950# a path in the client1951if self.clientSpecDirs:1952if self.clientSpecDirs.map_in_client(f['path']) =="":1953continue19541955 filesForCommit.append(f)1956if f['action']in self.delete_actions:1957 filesToDelete.append(f)1958else:1959 filesToRead.append(f)19601961# deleted files...1962for f in filesToDelete:1963 self.streamOneP4Deletion(f)19641965iflen(filesToRead) >0:1966 self.stream_file = {}1967 self.stream_contents = []1968 self.stream_have_file_info =False19691970# curry self argument1971defstreamP4FilesCbSelf(entry):1972 self.streamP4FilesCb(entry)19731974 fileArgs = ['%s#%s'% (f['path'], f['rev'])for f in filesToRead]19751976p4CmdList(["-x","-","print"],1977 stdin=fileArgs,1978 cb=streamP4FilesCbSelf)19791980# do the last chunk1981if self.stream_file.has_key('depotFile'):1982 self.streamOneP4File(self.stream_file, self.stream_contents)19831984defmake_email(self, userid):1985if userid in self.users:1986return self.users[userid]1987else:1988return"%s<a@b>"% userid19891990# Stream a p4 tag1991defstreamTag(self, gitStream, labelName, labelDetails, commit, epoch):1992if verbose:1993print"writing tag%sfor commit%s"% (labelName, commit)1994 gitStream.write("tag%s\n"% labelName)1995 gitStream.write("from%s\n"% commit)19961997if labelDetails.has_key('Owner'):1998 owner = labelDetails["Owner"]1999else:2000 owner =None20012002# Try to use the owner of the p4 label, or failing that,2003# the current p4 user id.2004if owner:2005 email = self.make_email(owner)2006else:2007 email = self.make_email(self.p4UserId())2008 tagger ="%s %s %s"% (email, epoch, self.tz)20092010 gitStream.write("tagger%s\n"% tagger)20112012print"labelDetails=",labelDetails2013if labelDetails.has_key('Description'):2014 description = labelDetails['Description']2015else:2016 description ='Label from git p4'20172018 gitStream.write("data%d\n"%len(description))2019 gitStream.write(description)2020 gitStream.write("\n")20212022defcommit(self, details, files, branch, branchPrefixes, parent =""):2023 epoch = details["time"]2024 author = details["user"]2025 self.branchPrefixes = branchPrefixes20262027if self.verbose:2028print"commit into%s"% branch20292030# start with reading files; if that fails, we should not2031# create a commit.2032 new_files = []2033for f in files:2034if[p for p in branchPrefixes ifp4PathStartsWith(f['path'], p)]:2035 new_files.append(f)2036else:2037 sys.stderr.write("Ignoring file outside of prefix:%s\n"% f['path'])20382039 self.gitStream.write("commit%s\n"% branch)2040# gitStream.write("mark :%s\n" % details["change"])2041 self.committedChanges.add(int(details["change"]))2042 committer =""2043if author not in self.users:2044 self.getUserMapFromPerforceServer()2045 committer ="%s %s %s"% (self.make_email(author), epoch, self.tz)20462047 self.gitStream.write("committer%s\n"% committer)20482049 self.gitStream.write("data <<EOT\n")2050 self.gitStream.write(details["desc"])2051 self.gitStream.write("\n[git-p4: depot-paths =\"%s\": change =%s"2052% (','.join(branchPrefixes), details["change"]))2053iflen(details['options']) >0:2054 self.gitStream.write(": options =%s"% details['options'])2055 self.gitStream.write("]\nEOT\n\n")20562057iflen(parent) >0:2058if self.verbose:2059print"parent%s"% parent2060 self.gitStream.write("from%s\n"% parent)20612062 self.streamP4Files(new_files)2063 self.gitStream.write("\n")20642065 change =int(details["change"])20662067if self.labels.has_key(change):2068 label = self.labels[change]2069 labelDetails = label[0]2070 labelRevisions = label[1]2071if self.verbose:2072print"Change%sis labelled%s"% (change, labelDetails)20732074 files =p4CmdList(["files"] + ["%s...@%s"% (p, change)2075for p in branchPrefixes])20762077iflen(files) ==len(labelRevisions):20782079 cleanedFiles = {}2080for info in files:2081if info["action"]in self.delete_actions:2082continue2083 cleanedFiles[info["depotFile"]] = info["rev"]20842085if cleanedFiles == labelRevisions:2086 self.streamTag(self.gitStream,'tag_%s'% labelDetails['label'], labelDetails, branch, epoch)20872088else:2089if not self.silent:2090print("Tag%sdoes not match with change%s: files do not match."2091% (labelDetails["label"], change))20922093else:2094if not self.silent:2095print("Tag%sdoes not match with change%s: file count is different."2096% (labelDetails["label"], change))20972098# Build a dictionary of changelists and labels, for "detect-labels" option.2099defgetLabels(self):2100 self.labels = {}21012102 l =p4CmdList(["labels"] + ["%s..."% p for p in self.depotPaths])2103iflen(l) >0and not self.silent:2104print"Finding files belonging to labels in%s"% `self.depotPaths`21052106for output in l:2107 label = output["label"]2108 revisions = {}2109 newestChange =02110if self.verbose:2111print"Querying files for label%s"% label2112forfileinp4CmdList(["files"] +2113["%s...@%s"% (p, label)2114for p in self.depotPaths]):2115 revisions[file["depotFile"]] =file["rev"]2116 change =int(file["change"])2117if change > newestChange:2118 newestChange = change21192120 self.labels[newestChange] = [output, revisions]21212122if self.verbose:2123print"Label changes:%s"% self.labels.keys()21242125# Import p4 labels as git tags. A direct mapping does not2126# exist, so assume that if all the files are at the same revision2127# then we can use that, or it's something more complicated we should2128# just ignore.2129defimportP4Labels(self, stream, p4Labels):2130if verbose:2131print"import p4 labels: "+' '.join(p4Labels)21322133 ignoredP4Labels =gitConfigList("git-p4.ignoredP4Labels")2134 validLabelRegexp =gitConfig("git-p4.labelImportRegexp")2135iflen(validLabelRegexp) ==0:2136 validLabelRegexp = defaultLabelRegexp2137 m = re.compile(validLabelRegexp)21382139for name in p4Labels:2140 commitFound =False21412142if not m.match(name):2143if verbose:2144print"label%sdoes not match regexp%s"% (name,validLabelRegexp)2145continue21462147if name in ignoredP4Labels:2148continue21492150 labelDetails =p4CmdList(['label',"-o", name])[0]21512152# get the most recent changelist for each file in this label2153 change =p4Cmd(["changes","-m","1"] + ["%s...@%s"% (p, name)2154for p in self.depotPaths])21552156if change.has_key('change'):2157# find the corresponding git commit; take the oldest commit2158 changelist =int(change['change'])2159 gitCommit =read_pipe(["git","rev-list","--max-count=1",2160"--reverse",":/\[git-p4:.*change =%d\]"% changelist])2161iflen(gitCommit) ==0:2162print"could not find git commit for changelist%d"% changelist2163else:2164 gitCommit = gitCommit.strip()2165 commitFound =True2166# Convert from p4 time format2167try:2168 tmwhen = time.strptime(labelDetails['Update'],"%Y/%m/%d%H:%M:%S")2169exceptValueError:2170print"Could not convert label time%s"% labelDetail['Update']2171 tmwhen =121722173 when =int(time.mktime(tmwhen))2174 self.streamTag(stream, name, labelDetails, gitCommit, when)2175if verbose:2176print"p4 label%smapped to git commit%s"% (name, gitCommit)2177else:2178if verbose:2179print"Label%shas no changelists - possibly deleted?"% name21802181if not commitFound:2182# We can't import this label; don't try again as it will get very2183# expensive repeatedly fetching all the files for labels that will2184# never be imported. If the label is moved in the future, the2185# ignore will need to be removed manually.2186system(["git","config","--add","git-p4.ignoredP4Labels", name])21872188defguessProjectName(self):2189for p in self.depotPaths:2190if p.endswith("/"):2191 p = p[:-1]2192 p = p[p.strip().rfind("/") +1:]2193if not p.endswith("/"):2194 p +="/"2195return p21962197defgetBranchMapping(self):2198 lostAndFoundBranches =set()21992200 user =gitConfig("git-p4.branchUser")2201iflen(user) >0:2202 command ="branches -u%s"% user2203else:2204 command ="branches"22052206for info inp4CmdList(command):2207 details =p4Cmd(["branch","-o", info["branch"]])2208 viewIdx =02209while details.has_key("View%s"% viewIdx):2210 paths = details["View%s"% viewIdx].split(" ")2211 viewIdx = viewIdx +12212# require standard //depot/foo/... //depot/bar/... mapping2213iflen(paths) !=2or not paths[0].endswith("/...")or not paths[1].endswith("/..."):2214continue2215 source = paths[0]2216 destination = paths[1]2217## HACK2218ifp4PathStartsWith(source, self.depotPaths[0])andp4PathStartsWith(destination, self.depotPaths[0]):2219 source = source[len(self.depotPaths[0]):-4]2220 destination = destination[len(self.depotPaths[0]):-4]22212222if destination in self.knownBranches:2223if not self.silent:2224print"p4 branch%sdefines a mapping from%sto%s"% (info["branch"], source, destination)2225print"but there exists another mapping from%sto%salready!"% (self.knownBranches[destination], destination)2226continue22272228 self.knownBranches[destination] = source22292230 lostAndFoundBranches.discard(destination)22312232if source not in self.knownBranches:2233 lostAndFoundBranches.add(source)22342235# Perforce does not strictly require branches to be defined, so we also2236# check git config for a branch list.2237#2238# Example of branch definition in git config file:2239# [git-p4]2240# branchList=main:branchA2241# branchList=main:branchB2242# branchList=branchA:branchC2243 configBranches =gitConfigList("git-p4.branchList")2244for branch in configBranches:2245if branch:2246(source, destination) = branch.split(":")2247 self.knownBranches[destination] = source22482249 lostAndFoundBranches.discard(destination)22502251if source not in self.knownBranches:2252 lostAndFoundBranches.add(source)225322542255for branch in lostAndFoundBranches:2256 self.knownBranches[branch] = branch22572258defgetBranchMappingFromGitBranches(self):2259 branches =p4BranchesInGit(self.importIntoRemotes)2260for branch in branches.keys():2261if branch =="master":2262 branch ="main"2263else:2264 branch = branch[len(self.projectName):]2265 self.knownBranches[branch] = branch22662267deflistExistingP4GitBranches(self):2268# branches holds mapping from name to commit2269 branches =p4BranchesInGit(self.importIntoRemotes)2270 self.p4BranchesInGit = branches.keys()2271for branch in branches.keys():2272 self.initialParents[self.refPrefix + branch] = branches[branch]22732274defupdateOptionDict(self, d):2275 option_keys = {}2276if self.keepRepoPath:2277 option_keys['keepRepoPath'] =122782279 d["options"] =' '.join(sorted(option_keys.keys()))22802281defreadOptions(self, d):2282 self.keepRepoPath = (d.has_key('options')2283and('keepRepoPath'in d['options']))22842285defgitRefForBranch(self, branch):2286if branch =="main":2287return self.refPrefix +"master"22882289iflen(branch) <=0:2290return branch22912292return self.refPrefix + self.projectName + branch22932294defgitCommitByP4Change(self, ref, change):2295if self.verbose:2296print"looking in ref "+ ref +" for change%susing bisect..."% change22972298 earliestCommit =""2299 latestCommit =parseRevision(ref)23002301while True:2302if self.verbose:2303print"trying: earliest%slatest%s"% (earliestCommit, latestCommit)2304 next =read_pipe("git rev-list --bisect%s %s"% (latestCommit, earliestCommit)).strip()2305iflen(next) ==0:2306if self.verbose:2307print"argh"2308return""2309 log =extractLogMessageFromGitCommit(next)2310 settings =extractSettingsGitLog(log)2311 currentChange =int(settings['change'])2312if self.verbose:2313print"current change%s"% currentChange23142315if currentChange == change:2316if self.verbose:2317print"found%s"% next2318return next23192320if currentChange < change:2321 earliestCommit ="^%s"% next2322else:2323 latestCommit ="%s"% next23242325return""23262327defimportNewBranch(self, branch, maxChange):2328# make fast-import flush all changes to disk and update the refs using the checkpoint2329# command so that we can try to find the branch parent in the git history2330 self.gitStream.write("checkpoint\n\n");2331 self.gitStream.flush();2332 branchPrefix = self.depotPaths[0] + branch +"/"2333range="@1,%s"% maxChange2334#print "prefix" + branchPrefix2335 changes =p4ChangesForPaths([branchPrefix],range)2336iflen(changes) <=0:2337return False2338 firstChange = changes[0]2339#print "first change in branch: %s" % firstChange2340 sourceBranch = self.knownBranches[branch]2341 sourceDepotPath = self.depotPaths[0] + sourceBranch2342 sourceRef = self.gitRefForBranch(sourceBranch)2343#print "source " + sourceBranch23442345 branchParentChange =int(p4Cmd(["changes","-m","1","%s...@1,%s"% (sourceDepotPath, firstChange)])["change"])2346#print "branch parent: %s" % branchParentChange2347 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)2348iflen(gitParent) >0:2349 self.initialParents[self.gitRefForBranch(branch)] = gitParent2350#print "parent git commit: %s" % gitParent23512352 self.importChanges(changes)2353return True23542355defsearchParent(self, parent, branch, target):2356 parentFound =False2357for blob inread_pipe_lines(["git","rev-list","--reverse","--no-merges", parent]):2358 blob = blob.strip()2359iflen(read_pipe(["git","diff-tree", blob, target])) ==0:2360 parentFound =True2361if self.verbose:2362print"Found parent of%sin commit%s"% (branch, blob)2363break2364if parentFound:2365return blob2366else:2367return None23682369defimportChanges(self, changes):2370 cnt =12371for change in changes:2372 description =p4Cmd(["describe",str(change)])2373 self.updateOptionDict(description)23742375if not self.silent:2376 sys.stdout.write("\rImporting revision%s(%s%%)"% (change, cnt *100/len(changes)))2377 sys.stdout.flush()2378 cnt = cnt +123792380try:2381if self.detectBranches:2382 branches = self.splitFilesIntoBranches(description)2383for branch in branches.keys():2384## HACK --hwn2385 branchPrefix = self.depotPaths[0] + branch +"/"23862387 parent =""23882389 filesForCommit = branches[branch]23902391if self.verbose:2392print"branch is%s"% branch23932394 self.updatedBranches.add(branch)23952396if branch not in self.createdBranches:2397 self.createdBranches.add(branch)2398 parent = self.knownBranches[branch]2399if parent == branch:2400 parent =""2401else:2402 fullBranch = self.projectName + branch2403if fullBranch not in self.p4BranchesInGit:2404if not self.silent:2405print("\nImporting new branch%s"% fullBranch);2406if self.importNewBranch(branch, change -1):2407 parent =""2408 self.p4BranchesInGit.append(fullBranch)2409if not self.silent:2410print("\nResuming with change%s"% change);24112412if self.verbose:2413print"parent determined through known branches:%s"% parent24142415 branch = self.gitRefForBranch(branch)2416 parent = self.gitRefForBranch(parent)24172418if self.verbose:2419print"looking for initial parent for%s; current parent is%s"% (branch, parent)24202421iflen(parent) ==0and branch in self.initialParents:2422 parent = self.initialParents[branch]2423del self.initialParents[branch]24242425 blob =None2426iflen(parent) >0:2427 tempBranch = os.path.join(self.tempBranchLocation,"%d"% (change))2428if self.verbose:2429print"Creating temporary branch: "+ tempBranch2430 self.commit(description, filesForCommit, tempBranch, [branchPrefix])2431 self.tempBranches.append(tempBranch)2432 self.checkpoint()2433 blob = self.searchParent(parent, branch, tempBranch)2434if blob:2435 self.commit(description, filesForCommit, branch, [branchPrefix], blob)2436else:2437if self.verbose:2438print"Parent of%snot found. Committing into head of%s"% (branch, parent)2439 self.commit(description, filesForCommit, branch, [branchPrefix], parent)2440else:2441 files = self.extractFilesFromCommit(description)2442 self.commit(description, files, self.branch, self.depotPaths,2443 self.initialParent)2444 self.initialParent =""2445exceptIOError:2446print self.gitError.read()2447 sys.exit(1)24482449defimportHeadRevision(self, revision):2450print"Doing initial import of%sfrom revision%sinto%s"% (' '.join(self.depotPaths), revision, self.branch)24512452 details = {}2453 details["user"] ="git perforce import user"2454 details["desc"] = ("Initial import of%sfrom the state at revision%s\n"2455% (' '.join(self.depotPaths), revision))2456 details["change"] = revision2457 newestRevision =024582459 fileCnt =02460 fileArgs = ["%s...%s"% (p,revision)for p in self.depotPaths]24612462for info inp4CmdList(["files"] + fileArgs):24632464if'code'in info and info['code'] =='error':2465 sys.stderr.write("p4 returned an error:%s\n"2466% info['data'])2467if info['data'].find("must refer to client") >=0:2468 sys.stderr.write("This particular p4 error is misleading.\n")2469 sys.stderr.write("Perhaps the depot path was misspelled.\n");2470 sys.stderr.write("Depot path:%s\n"%" ".join(self.depotPaths))2471 sys.exit(1)2472if'p4ExitCode'in info:2473 sys.stderr.write("p4 exitcode:%s\n"% info['p4ExitCode'])2474 sys.exit(1)247524762477 change =int(info["change"])2478if change > newestRevision:2479 newestRevision = change24802481if info["action"]in self.delete_actions:2482# don't increase the file cnt, otherwise details["depotFile123"] will have gaps!2483#fileCnt = fileCnt + 12484continue24852486for prop in["depotFile","rev","action","type"]:2487 details["%s%s"% (prop, fileCnt)] = info[prop]24882489 fileCnt = fileCnt +124902491 details["change"] = newestRevision24922493# Use time from top-most change so that all git p4 clones of2494# the same p4 repo have the same commit SHA1s.2495 res =p4CmdList("describe -s%d"% newestRevision)2496 newestTime =None2497for r in res:2498if r.has_key('time'):2499 newestTime =int(r['time'])2500if newestTime is None:2501die("\"describe -s\"on newest change%ddid not give a time")2502 details["time"] = newestTime25032504 self.updateOptionDict(details)2505try:2506 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPaths)2507exceptIOError:2508print"IO error with git fast-import. Is your git version recent enough?"2509print self.gitError.read()251025112512defrun(self, args):2513 self.depotPaths = []2514 self.changeRange =""2515 self.initialParent =""2516 self.previousDepotPaths = []25172518# map from branch depot path to parent branch2519 self.knownBranches = {}2520 self.initialParents = {}2521 self.hasOrigin =originP4BranchesExist()2522if not self.syncWithOrigin:2523 self.hasOrigin =False25242525if self.importIntoRemotes:2526 self.refPrefix ="refs/remotes/p4/"2527else:2528 self.refPrefix ="refs/heads/p4/"25292530if self.syncWithOrigin and self.hasOrigin:2531if not self.silent:2532print"Syncing with origin first by calling git fetch origin"2533system("git fetch origin")25342535iflen(self.branch) ==0:2536 self.branch = self.refPrefix +"master"2537ifgitBranchExists("refs/heads/p4")and self.importIntoRemotes:2538system("git update-ref%srefs/heads/p4"% self.branch)2539system("git branch -D p4");2540# create it /after/ importing, when master exists2541if notgitBranchExists(self.refPrefix +"HEAD")and self.importIntoRemotes andgitBranchExists(self.branch):2542system("git symbolic-ref%sHEAD%s"% (self.refPrefix, self.branch))25432544# accept either the command-line option, or the configuration variable2545if self.useClientSpec:2546# will use this after clone to set the variable2547 self.useClientSpec_from_options =True2548else:2549ifgitConfig("git-p4.useclientspec","--bool") =="true":2550 self.useClientSpec =True2551if self.useClientSpec:2552 self.clientSpecDirs =getClientSpec()25532554# TODO: should always look at previous commits,2555# merge with previous imports, if possible.2556if args == []:2557if self.hasOrigin:2558createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)2559 self.listExistingP4GitBranches()25602561iflen(self.p4BranchesInGit) >1:2562if not self.silent:2563print"Importing from/into multiple branches"2564 self.detectBranches =True25652566if self.verbose:2567print"branches:%s"% self.p4BranchesInGit25682569 p4Change =02570for branch in self.p4BranchesInGit:2571 logMsg =extractLogMessageFromGitCommit(self.refPrefix + branch)25722573 settings =extractSettingsGitLog(logMsg)25742575 self.readOptions(settings)2576if(settings.has_key('depot-paths')2577and settings.has_key('change')):2578 change =int(settings['change']) +12579 p4Change =max(p4Change, change)25802581 depotPaths =sorted(settings['depot-paths'])2582if self.previousDepotPaths == []:2583 self.previousDepotPaths = depotPaths2584else:2585 paths = []2586for(prev, cur)inzip(self.previousDepotPaths, depotPaths):2587 prev_list = prev.split("/")2588 cur_list = cur.split("/")2589for i inrange(0,min(len(cur_list),len(prev_list))):2590if cur_list[i] <> prev_list[i]:2591 i = i -12592break25932594 paths.append("/".join(cur_list[:i +1]))25952596 self.previousDepotPaths = paths25972598if p4Change >0:2599 self.depotPaths =sorted(self.previousDepotPaths)2600 self.changeRange ="@%s,#head"% p4Change2601if not self.detectBranches:2602 self.initialParent =parseRevision(self.branch)2603if not self.silent and not self.detectBranches:2604print"Performing incremental import into%sgit branch"% self.branch26052606if not self.branch.startswith("refs/"):2607 self.branch ="refs/heads/"+ self.branch26082609iflen(args) ==0and self.depotPaths:2610if not self.silent:2611print"Depot paths:%s"%' '.join(self.depotPaths)2612else:2613if self.depotPaths and self.depotPaths != args:2614print("previous import used depot path%sand now%swas specified. "2615"This doesn't work!"% (' '.join(self.depotPaths),2616' '.join(args)))2617 sys.exit(1)26182619 self.depotPaths =sorted(args)26202621 revision =""2622 self.users = {}26232624# Make sure no revision specifiers are used when --changesfile2625# is specified.2626 bad_changesfile =False2627iflen(self.changesFile) >0:2628for p in self.depotPaths:2629if p.find("@") >=0or p.find("#") >=0:2630 bad_changesfile =True2631break2632if bad_changesfile:2633die("Option --changesfile is incompatible with revision specifiers")26342635 newPaths = []2636for p in self.depotPaths:2637if p.find("@") != -1:2638 atIdx = p.index("@")2639 self.changeRange = p[atIdx:]2640if self.changeRange =="@all":2641 self.changeRange =""2642elif','not in self.changeRange:2643 revision = self.changeRange2644 self.changeRange =""2645 p = p[:atIdx]2646elif p.find("#") != -1:2647 hashIdx = p.index("#")2648 revision = p[hashIdx:]2649 p = p[:hashIdx]2650elif self.previousDepotPaths == []:2651# pay attention to changesfile, if given, else import2652# the entire p4 tree at the head revision2653iflen(self.changesFile) ==0:2654 revision ="#head"26552656 p = re.sub("\.\.\.$","", p)2657if not p.endswith("/"):2658 p +="/"26592660 newPaths.append(p)26612662 self.depotPaths = newPaths26632664 self.loadUserMapFromCache()2665 self.labels = {}2666if self.detectLabels:2667 self.getLabels();26682669if self.detectBranches:2670## FIXME - what's a P4 projectName ?2671 self.projectName = self.guessProjectName()26722673if self.hasOrigin:2674 self.getBranchMappingFromGitBranches()2675else:2676 self.getBranchMapping()2677if self.verbose:2678print"p4-git branches:%s"% self.p4BranchesInGit2679print"initial parents:%s"% self.initialParents2680for b in self.p4BranchesInGit:2681if b !="master":26822683## FIXME2684 b = b[len(self.projectName):]2685 self.createdBranches.add(b)26862687 self.tz ="%+03d%02d"% (- time.timezone /3600, ((- time.timezone %3600) /60))26882689 importProcess = subprocess.Popen(["git","fast-import"],2690 stdin=subprocess.PIPE, stdout=subprocess.PIPE,2691 stderr=subprocess.PIPE);2692 self.gitOutput = importProcess.stdout2693 self.gitStream = importProcess.stdin2694 self.gitError = importProcess.stderr26952696if revision:2697 self.importHeadRevision(revision)2698else:2699 changes = []27002701iflen(self.changesFile) >0:2702 output =open(self.changesFile).readlines()2703 changeSet =set()2704for line in output:2705 changeSet.add(int(line))27062707for change in changeSet:2708 changes.append(change)27092710 changes.sort()2711else:2712# catch "git p4 sync" with no new branches, in a repo that2713# does not have any existing p4 branches2714iflen(args) ==0and not self.p4BranchesInGit:2715die("No remote p4 branches. Perhaps you never did\"git p4 clone\"in here.");2716if self.verbose:2717print"Getting p4 changes for%s...%s"% (', '.join(self.depotPaths),2718 self.changeRange)2719 changes =p4ChangesForPaths(self.depotPaths, self.changeRange)27202721iflen(self.maxChanges) >0:2722 changes = changes[:min(int(self.maxChanges),len(changes))]27232724iflen(changes) ==0:2725if not self.silent:2726print"No changes to import!"2727else:2728if not self.silent and not self.detectBranches:2729print"Import destination:%s"% self.branch27302731 self.updatedBranches =set()27322733 self.importChanges(changes)27342735if not self.silent:2736print""2737iflen(self.updatedBranches) >0:2738 sys.stdout.write("Updated branches: ")2739for b in self.updatedBranches:2740 sys.stdout.write("%s"% b)2741 sys.stdout.write("\n")27422743ifgitConfig("git-p4.importLabels","--bool") =="true":2744 self.importLabels =True27452746if self.importLabels:2747 p4Labels =getP4Labels(self.depotPaths)2748 gitTags =getGitTags()27492750 missingP4Labels = p4Labels - gitTags2751 self.importP4Labels(self.gitStream, missingP4Labels)27522753 self.gitStream.close()2754if importProcess.wait() !=0:2755die("fast-import failed:%s"% self.gitError.read())2756 self.gitOutput.close()2757 self.gitError.close()27582759# Cleanup temporary branches created during import2760if self.tempBranches != []:2761for branch in self.tempBranches:2762read_pipe("git update-ref -d%s"% branch)2763 os.rmdir(os.path.join(os.environ.get("GIT_DIR",".git"), self.tempBranchLocation))27642765return True27662767classP4Rebase(Command):2768def__init__(self):2769 Command.__init__(self)2770 self.options = [2771 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),2772]2773 self.importLabels =False2774 self.description = ("Fetches the latest revision from perforce and "2775+"rebases the current work (branch) against it")27762777defrun(self, args):2778 sync =P4Sync()2779 sync.importLabels = self.importLabels2780 sync.run([])27812782return self.rebase()27832784defrebase(self):2785if os.system("git update-index --refresh") !=0:2786die("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.");2787iflen(read_pipe("git diff-index HEAD --")) >0:2788die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash.");27892790[upstream, settings] =findUpstreamBranchPoint()2791iflen(upstream) ==0:2792die("Cannot find upstream branchpoint for rebase")27932794# the branchpoint may be p4/foo~3, so strip off the parent2795 upstream = re.sub("~[0-9]+$","", upstream)27962797print"Rebasing the current branch onto%s"% upstream2798 oldHead =read_pipe("git rev-parse HEAD").strip()2799system("git rebase%s"% upstream)2800system("git diff-tree --stat --summary -M%sHEAD"% oldHead)2801return True28022803classP4Clone(P4Sync):2804def__init__(self):2805 P4Sync.__init__(self)2806 self.description ="Creates a new git repository and imports from Perforce into it"2807 self.usage ="usage: %prog [options] //depot/path[@revRange]"2808 self.options += [2809 optparse.make_option("--destination", dest="cloneDestination",2810 action='store', default=None,2811help="where to leave result of the clone"),2812 optparse.make_option("-/", dest="cloneExclude",2813 action="append",type="string",2814help="exclude depot path"),2815 optparse.make_option("--bare", dest="cloneBare",2816 action="store_true", default=False),2817]2818 self.cloneDestination =None2819 self.needsGit =False2820 self.cloneBare =False28212822# This is required for the "append" cloneExclude action2823defensure_value(self, attr, value):2824if nothasattr(self, attr)orgetattr(self, attr)is None:2825setattr(self, attr, value)2826returngetattr(self, attr)28272828defdefaultDestination(self, args):2829## TODO: use common prefix of args?2830 depotPath = args[0]2831 depotDir = re.sub("(@[^@]*)$","", depotPath)2832 depotDir = re.sub("(#[^#]*)$","", depotDir)2833 depotDir = re.sub(r"\.\.\.$","", depotDir)2834 depotDir = re.sub(r"/$","", depotDir)2835return os.path.split(depotDir)[1]28362837defrun(self, args):2838iflen(args) <1:2839return False28402841if self.keepRepoPath and not self.cloneDestination:2842 sys.stderr.write("Must specify destination for --keep-path\n")2843 sys.exit(1)28442845 depotPaths = args28462847if not self.cloneDestination andlen(depotPaths) >1:2848 self.cloneDestination = depotPaths[-1]2849 depotPaths = depotPaths[:-1]28502851 self.cloneExclude = ["/"+p for p in self.cloneExclude]2852for p in depotPaths:2853if not p.startswith("//"):2854return False28552856if not self.cloneDestination:2857 self.cloneDestination = self.defaultDestination(args)28582859print"Importing from%sinto%s"% (', '.join(depotPaths), self.cloneDestination)28602861if not os.path.exists(self.cloneDestination):2862 os.makedirs(self.cloneDestination)2863chdir(self.cloneDestination)28642865 init_cmd = ["git","init"]2866if self.cloneBare:2867 init_cmd.append("--bare")2868 subprocess.check_call(init_cmd)28692870if not P4Sync.run(self, depotPaths):2871return False2872if self.branch !="master":2873if self.importIntoRemotes:2874 masterbranch ="refs/remotes/p4/master"2875else:2876 masterbranch ="refs/heads/p4/master"2877ifgitBranchExists(masterbranch):2878system("git branch master%s"% masterbranch)2879if not self.cloneBare:2880system("git checkout -f")2881else:2882print"Could not detect main branch. No checkout/master branch created."28832884# auto-set this variable if invoked with --use-client-spec2885if self.useClientSpec_from_options:2886system("git config --bool git-p4.useclientspec true")28872888return True28892890classP4Branches(Command):2891def__init__(self):2892 Command.__init__(self)2893 self.options = [ ]2894 self.description = ("Shows the git branches that hold imports and their "2895+"corresponding perforce depot paths")2896 self.verbose =False28972898defrun(self, args):2899iforiginP4BranchesExist():2900createOrUpdateBranchesFromOrigin()29012902 cmdline ="git rev-parse --symbolic "2903 cmdline +=" --remotes"29042905for line inread_pipe_lines(cmdline):2906 line = line.strip()29072908if not line.startswith('p4/')or line =="p4/HEAD":2909continue2910 branch = line29112912 log =extractLogMessageFromGitCommit("refs/remotes/%s"% branch)2913 settings =extractSettingsGitLog(log)29142915print"%s<=%s(%s)"% (branch,",".join(settings["depot-paths"]), settings["change"])2916return True29172918classHelpFormatter(optparse.IndentedHelpFormatter):2919def__init__(self):2920 optparse.IndentedHelpFormatter.__init__(self)29212922defformat_description(self, description):2923if description:2924return description +"\n"2925else:2926return""29272928defprintUsage(commands):2929print"usage:%s<command> [options]"% sys.argv[0]2930print""2931print"valid commands:%s"%", ".join(commands)2932print""2933print"Try%s<command> --help for command specific help."% sys.argv[0]2934print""29352936commands = {2937"debug": P4Debug,2938"submit": P4Submit,2939"commit": P4Submit,2940"sync": P4Sync,2941"rebase": P4Rebase,2942"clone": P4Clone,2943"rollback": P4RollBack,2944"branches": P4Branches2945}294629472948defmain():2949iflen(sys.argv[1:]) ==0:2950printUsage(commands.keys())2951 sys.exit(2)29522953 cmd =""2954 cmdName = sys.argv[1]2955try:2956 klass = commands[cmdName]2957 cmd =klass()2958exceptKeyError:2959print"unknown command%s"% cmdName2960print""2961printUsage(commands.keys())2962 sys.exit(2)29632964 options = cmd.options2965 cmd.gitdir = os.environ.get("GIT_DIR",None)29662967 args = sys.argv[2:]29682969 options.append(optparse.make_option("--verbose", dest="verbose", action="store_true"))2970if cmd.needsGit:2971 options.append(optparse.make_option("--git-dir", dest="gitdir"))29722973 parser = optparse.OptionParser(cmd.usage.replace("%prog","%prog "+ cmdName),2974 options,2975 description = cmd.description,2976 formatter =HelpFormatter())29772978(cmd, args) = parser.parse_args(sys.argv[2:], cmd);2979global verbose2980 verbose = cmd.verbose2981if cmd.needsGit:2982if cmd.gitdir ==None:2983 cmd.gitdir = os.path.abspath(".git")2984if notisValidGitDir(cmd.gitdir):2985 cmd.gitdir =read_pipe("git rev-parse --git-dir").strip()2986if os.path.exists(cmd.gitdir):2987 cdup =read_pipe("git rev-parse --show-cdup").strip()2988iflen(cdup) >0:2989chdir(cdup);29902991if notisValidGitDir(cmd.gitdir):2992ifisValidGitDir(cmd.gitdir +"/.git"):2993 cmd.gitdir +="/.git"2994else:2995die("fatal: cannot locate git repository at%s"% cmd.gitdir)29962997 os.environ["GIT_DIR"] = cmd.gitdir29982999if not cmd.run(args):3000 parser.print_help()3001 sys.exit(2)300230033004if __name__ =='__main__':3005main()