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.origin ="" 860 self.detectRenames =False 861 self.preserveUser =gitConfig("git-p4.preserveUser").lower() =="true" 862 self.isWindows = (platform.system() =="Windows") 863 self.exportLabels =False 864 self.p4HasMoveCommand =p4_has_command("move") 865 866defcheck(self): 867iflen(p4CmdList("opened ...")) >0: 868die("You have files opened with perforce! Close them before starting the sync.") 869 870defseparate_jobs_from_description(self, message): 871"""Extract and return a possible Jobs field in the commit 872 message. It goes into a separate section in the p4 change 873 specification. 874 875 A jobs line starts with "Jobs:" and looks like a new field 876 in a form. Values are white-space separated on the same 877 line or on following lines that start with a tab. 878 879 This does not parse and extract the full git commit message 880 like a p4 form. It just sees the Jobs: line as a marker 881 to pass everything from then on directly into the p4 form, 882 but outside the description section. 883 884 Return a tuple (stripped log message, jobs string).""" 885 886 m = re.search(r'^Jobs:', message, re.MULTILINE) 887if m is None: 888return(message,None) 889 890 jobtext = message[m.start():] 891 stripped_message = message[:m.start()].rstrip() 892return(stripped_message, jobtext) 893 894defprepareLogMessage(self, template, message, jobs): 895"""Edits the template returned from "p4 change -o" to insert 896 the message in the Description field, and the jobs text in 897 the Jobs field.""" 898 result ="" 899 900 inDescriptionSection =False 901 902for line in template.split("\n"): 903if line.startswith("#"): 904 result += line +"\n" 905continue 906 907if inDescriptionSection: 908if line.startswith("Files:")or line.startswith("Jobs:"): 909 inDescriptionSection =False 910# insert Jobs section 911if jobs: 912 result += jobs +"\n" 913else: 914continue 915else: 916if line.startswith("Description:"): 917 inDescriptionSection =True 918 line +="\n" 919for messageLine in message.split("\n"): 920 line +="\t"+ messageLine +"\n" 921 922 result += line +"\n" 923 924return result 925 926defpatchRCSKeywords(self,file, pattern): 927# Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern 928(handle, outFileName) = tempfile.mkstemp(dir='.') 929try: 930 outFile = os.fdopen(handle,"w+") 931 inFile =open(file,"r") 932 regexp = re.compile(pattern, re.VERBOSE) 933for line in inFile.readlines(): 934 line = regexp.sub(r'$\1$', line) 935 outFile.write(line) 936 inFile.close() 937 outFile.close() 938# Forcibly overwrite the original file 939 os.unlink(file) 940 shutil.move(outFileName,file) 941except: 942# cleanup our temporary file 943 os.unlink(outFileName) 944print"Failed to strip RCS keywords in%s"%file 945raise 946 947print"Patched up RCS keywords in%s"%file 948 949defp4UserForCommit(self,id): 950# Return the tuple (perforce user,git email) for a given git commit id 951 self.getUserMapFromPerforceServer() 952 gitEmail =read_pipe("git log --max-count=1 --format='%%ae'%s"%id) 953 gitEmail = gitEmail.strip() 954if not self.emails.has_key(gitEmail): 955return(None,gitEmail) 956else: 957return(self.emails[gitEmail],gitEmail) 958 959defcheckValidP4Users(self,commits): 960# check if any git authors cannot be mapped to p4 users 961foridin commits: 962(user,email) = self.p4UserForCommit(id) 963if not user: 964 msg ="Cannot find p4 user for email%sin commit%s."% (email,id) 965ifgitConfig('git-p4.allowMissingP4Users').lower() =="true": 966print"%s"% msg 967else: 968die("Error:%s\nSet git-p4.allowMissingP4Users to true to allow this."% msg) 969 970deflastP4Changelist(self): 971# Get back the last changelist number submitted in this client spec. This 972# then gets used to patch up the username in the change. If the same 973# client spec is being used by multiple processes then this might go 974# wrong. 975 results =p4CmdList("client -o")# find the current client 976 client =None 977for r in results: 978if r.has_key('Client'): 979 client = r['Client'] 980break 981if not client: 982die("could not get client spec") 983 results =p4CmdList(["changes","-c", client,"-m","1"]) 984for r in results: 985if r.has_key('change'): 986return r['change'] 987die("Could not get changelist number for last submit - cannot patch up user details") 988 989defmodifyChangelistUser(self, changelist, newUser): 990# fixup the user field of a changelist after it has been submitted. 991 changes =p4CmdList("change -o%s"% changelist) 992iflen(changes) !=1: 993die("Bad output from p4 change modifying%sto user%s"% 994(changelist, newUser)) 995 996 c = changes[0] 997if c['User'] == newUser:return# nothing to do 998 c['User'] = newUser 999input= marshal.dumps(c)10001001 result =p4CmdList("change -f -i", stdin=input)1002for r in result:1003if r.has_key('code'):1004if r['code'] =='error':1005die("Could not modify user field of changelist%sto%s:%s"% (changelist, newUser, r['data']))1006if r.has_key('data'):1007print("Updated user field for changelist%sto%s"% (changelist, newUser))1008return1009die("Could not modify user field of changelist%sto%s"% (changelist, newUser))10101011defcanChangeChangelists(self):1012# check to see if we have p4 admin or super-user permissions, either of1013# which are required to modify changelists.1014 results =p4CmdList(["protects", self.depotPath])1015for r in results:1016if r.has_key('perm'):1017if r['perm'] =='admin':1018return11019if r['perm'] =='super':1020return11021return010221023defprepareSubmitTemplate(self):1024"""Run "p4 change -o" to grab a change specification template.1025 This does not use "p4 -G", as it is nice to keep the submission1026 template in original order, since a human might edit it.10271028 Remove lines in the Files section that show changes to files1029 outside the depot path we're committing into."""10301031 template =""1032 inFilesSection =False1033for line inp4_read_pipe_lines(['change','-o']):1034if line.endswith("\r\n"):1035 line = line[:-2] +"\n"1036if inFilesSection:1037if line.startswith("\t"):1038# path starts and ends with a tab1039 path = line[1:]1040 lastTab = path.rfind("\t")1041if lastTab != -1:1042 path = path[:lastTab]1043if notp4PathStartsWith(path, self.depotPath):1044continue1045else:1046 inFilesSection =False1047else:1048if line.startswith("Files:"):1049 inFilesSection =True10501051 template += line10521053return template10541055defedit_template(self, template_file):1056"""Invoke the editor to let the user change the submission1057 message. Return true if okay to continue with the submit."""10581059# if configured to skip the editing part, just submit1060ifgitConfig("git-p4.skipSubmitEdit") =="true":1061return True10621063# look at the modification time, to check later if the user saved1064# the file1065 mtime = os.stat(template_file).st_mtime10661067# invoke the editor1068if os.environ.has_key("P4EDITOR")and(os.environ.get("P4EDITOR") !=""):1069 editor = os.environ.get("P4EDITOR")1070else:1071 editor =read_pipe("git var GIT_EDITOR").strip()1072system(editor +" "+ template_file)10731074# If the file was not saved, prompt to see if this patch should1075# be skipped. But skip this verification step if configured so.1076ifgitConfig("git-p4.skipSubmitEditCheck") =="true":1077return True10781079# modification time updated means user saved the file1080if os.stat(template_file).st_mtime > mtime:1081return True10821083while True:1084 response =raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")1085if response =='y':1086return True1087if response =='n':1088return False10891090defapplyCommit(self,id):1091"""Apply one commit, return True if it succeeded."""10921093print"Applying",read_pipe(["git","show","-s",1094"--format=format:%h%s",id])10951096(p4User, gitEmail) = self.p4UserForCommit(id)10971098 diff =read_pipe_lines("git diff-tree -r%s\"%s^\" \"%s\""% (self.diffOpts,id,id))1099 filesToAdd =set()1100 filesToDelete =set()1101 editedFiles =set()1102 pureRenameCopy =set()1103 filesToChangeExecBit = {}11041105for line in diff:1106 diff =parseDiffTreeEntry(line)1107 modifier = diff['status']1108 path = diff['src']1109if modifier =="M":1110p4_edit(path)1111ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1112 filesToChangeExecBit[path] = diff['dst_mode']1113 editedFiles.add(path)1114elif modifier =="A":1115 filesToAdd.add(path)1116 filesToChangeExecBit[path] = diff['dst_mode']1117if path in filesToDelete:1118 filesToDelete.remove(path)1119elif modifier =="D":1120 filesToDelete.add(path)1121if path in filesToAdd:1122 filesToAdd.remove(path)1123elif modifier =="C":1124 src, dest = diff['src'], diff['dst']1125p4_integrate(src, dest)1126 pureRenameCopy.add(dest)1127if diff['src_sha1'] != diff['dst_sha1']:1128p4_edit(dest)1129 pureRenameCopy.discard(dest)1130ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1131p4_edit(dest)1132 pureRenameCopy.discard(dest)1133 filesToChangeExecBit[dest] = diff['dst_mode']1134 os.unlink(dest)1135 editedFiles.add(dest)1136elif modifier =="R":1137 src, dest = diff['src'], diff['dst']1138if self.p4HasMoveCommand:1139p4_edit(src)# src must be open before move1140p4_move(src, dest)# opens for (move/delete, move/add)1141else:1142p4_integrate(src, dest)1143if diff['src_sha1'] != diff['dst_sha1']:1144p4_edit(dest)1145else:1146 pureRenameCopy.add(dest)1147ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1148if not self.p4HasMoveCommand:1149p4_edit(dest)# with move: already open, writable1150 filesToChangeExecBit[dest] = diff['dst_mode']1151if not self.p4HasMoveCommand:1152 os.unlink(dest)1153 filesToDelete.add(src)1154 editedFiles.add(dest)1155else:1156die("unknown modifier%sfor%s"% (modifier, path))11571158 diffcmd ="git format-patch -k --stdout\"%s^\"..\"%s\""% (id,id)1159 patchcmd = diffcmd +" | git apply "1160 tryPatchCmd = patchcmd +"--check -"1161 applyPatchCmd = patchcmd +"--check --apply -"1162 patch_succeeded =True11631164if os.system(tryPatchCmd) !=0:1165 fixed_rcs_keywords =False1166 patch_succeeded =False1167print"Unfortunately applying the change failed!"11681169# Patch failed, maybe it's just RCS keyword woes. Look through1170# the patch to see if that's possible.1171ifgitConfig("git-p4.attemptRCSCleanup","--bool") =="true":1172file=None1173 pattern =None1174 kwfiles = {}1175forfilein editedFiles | filesToDelete:1176# did this file's delta contain RCS keywords?1177 pattern =p4_keywords_regexp_for_file(file)11781179if pattern:1180# this file is a possibility...look for RCS keywords.1181 regexp = re.compile(pattern, re.VERBOSE)1182for line inread_pipe_lines(["git","diff","%s^..%s"% (id,id),file]):1183if regexp.search(line):1184if verbose:1185print"got keyword match on%sin%sin%s"% (pattern, line,file)1186 kwfiles[file] = pattern1187break11881189forfilein kwfiles:1190if verbose:1191print"zapping%swith%s"% (line,pattern)1192 self.patchRCSKeywords(file, kwfiles[file])1193 fixed_rcs_keywords =True11941195if fixed_rcs_keywords:1196print"Retrying the patch with RCS keywords cleaned up"1197if os.system(tryPatchCmd) ==0:1198 patch_succeeded =True11991200if not patch_succeeded:1201for f in editedFiles:1202p4_revert(f)1203return False12041205system(applyPatchCmd)12061207for f in filesToAdd:1208p4_add(f)1209for f in filesToDelete:1210p4_revert(f)1211p4_delete(f)12121213# Set/clear executable bits1214for f in filesToChangeExecBit.keys():1215 mode = filesToChangeExecBit[f]1216setP4ExecBit(f, mode)12171218 logMessage =extractLogMessageFromGitCommit(id)1219 logMessage = logMessage.strip()1220(logMessage, jobs) = self.separate_jobs_from_description(logMessage)12211222 template = self.prepareSubmitTemplate()1223 submitTemplate = self.prepareLogMessage(template, logMessage, jobs)12241225if self.preserveUser:1226 submitTemplate = submitTemplate + ("\n######## Actual user%s, modified after commit\n"% p4User)12271228if os.environ.has_key("P4DIFF"):1229del(os.environ["P4DIFF"])1230 diff =""1231for editedFile in editedFiles:1232 diff +=p4_read_pipe(['diff','-du',1233wildcard_encode(editedFile)])12341235 newdiff =""1236for newFile in filesToAdd:1237 newdiff +="==== new file ====\n"1238 newdiff +="--- /dev/null\n"1239 newdiff +="+++%s\n"% newFile1240 f =open(newFile,"r")1241for line in f.readlines():1242 newdiff +="+"+ line1243 f.close()12441245if self.checkAuthorship and not self.p4UserIsMe(p4User):1246 submitTemplate +="######## git author%sdoes not match your p4 account.\n"% gitEmail1247 submitTemplate +="######## Use option --preserve-user to modify authorship.\n"1248 submitTemplate +="######## Variable git-p4.skipUserNameCheck hides this message.\n"12491250 separatorLine ="######## everything below this line is just the diff #######\n"12511252(handle, fileName) = tempfile.mkstemp()1253 tmpFile = os.fdopen(handle,"w+")1254if self.isWindows:1255 submitTemplate = submitTemplate.replace("\n","\r\n")1256 separatorLine = separatorLine.replace("\n","\r\n")1257 newdiff = newdiff.replace("\n","\r\n")1258 tmpFile.write(submitTemplate + separatorLine + diff + newdiff)1259 tmpFile.close()12601261if self.edit_template(fileName):1262# read the edited message and submit1263 ret =True1264 tmpFile =open(fileName,"rb")1265 message = tmpFile.read()1266 tmpFile.close()1267 submitTemplate = message[:message.index(separatorLine)]1268if self.isWindows:1269 submitTemplate = submitTemplate.replace("\r\n","\n")1270p4_write_pipe(['submit','-i'], submitTemplate)12711272if self.preserveUser:1273if p4User:1274# Get last changelist number. Cannot easily get it from1275# the submit command output as the output is1276# unmarshalled.1277 changelist = self.lastP4Changelist()1278 self.modifyChangelistUser(changelist, p4User)12791280# The rename/copy happened by applying a patch that created a1281# new file. This leaves it writable, which confuses p4.1282for f in pureRenameCopy:1283p4_sync(f,"-f")12841285else:1286# skip this patch1287 ret =False1288print"Submission cancelled, undoing p4 changes."1289for f in editedFiles:1290p4_revert(f)1291for f in filesToAdd:1292p4_revert(f)1293 os.remove(f)12941295 os.remove(fileName)1296return ret12971298# Export git tags as p4 labels. Create a p4 label and then tag1299# with that.1300defexportGitTags(self, gitTags):1301 validLabelRegexp =gitConfig("git-p4.labelExportRegexp")1302iflen(validLabelRegexp) ==0:1303 validLabelRegexp = defaultLabelRegexp1304 m = re.compile(validLabelRegexp)13051306for name in gitTags:13071308if not m.match(name):1309if verbose:1310print"tag%sdoes not match regexp%s"% (name, validLabelRegexp)1311continue13121313# Get the p4 commit this corresponds to1314 logMessage =extractLogMessageFromGitCommit(name)1315 values =extractSettingsGitLog(logMessage)13161317if not values.has_key('change'):1318# a tag pointing to something not sent to p4; ignore1319if verbose:1320print"git tag%sdoes not give a p4 commit"% name1321continue1322else:1323 changelist = values['change']13241325# Get the tag details.1326 inHeader =True1327 isAnnotated =False1328 body = []1329for l inread_pipe_lines(["git","cat-file","-p", name]):1330 l = l.strip()1331if inHeader:1332if re.match(r'tag\s+', l):1333 isAnnotated =True1334elif re.match(r'\s*$', l):1335 inHeader =False1336continue1337else:1338 body.append(l)13391340if not isAnnotated:1341 body = ["lightweight tag imported by git p4\n"]13421343# Create the label - use the same view as the client spec we are using1344 clientSpec =getClientSpec()13451346 labelTemplate ="Label:%s\n"% name1347 labelTemplate +="Description:\n"1348for b in body:1349 labelTemplate +="\t"+ b +"\n"1350 labelTemplate +="View:\n"1351for mapping in clientSpec.mappings:1352 labelTemplate +="\t%s\n"% mapping.depot_side.path13531354p4_write_pipe(["label","-i"], labelTemplate)13551356# Use the label1357p4_system(["tag","-l", name] +1358["%s@%s"% (mapping.depot_side.path, changelist)for mapping in clientSpec.mappings])13591360if verbose:1361print"created p4 label for tag%s"% name13621363defrun(self, args):1364iflen(args) ==0:1365 self.master =currentGitBranch()1366iflen(self.master) ==0or notgitBranchExists("refs/heads/%s"% self.master):1367die("Detecting current git branch failed!")1368eliflen(args) ==1:1369 self.master = args[0]1370if notbranchExists(self.master):1371die("Branch%sdoes not exist"% self.master)1372else:1373return False13741375 allowSubmit =gitConfig("git-p4.allowSubmit")1376iflen(allowSubmit) >0and not self.master in allowSubmit.split(","):1377die("%sis not in git-p4.allowSubmit"% self.master)13781379[upstream, settings] =findUpstreamBranchPoint()1380 self.depotPath = settings['depot-paths'][0]1381iflen(self.origin) ==0:1382 self.origin = upstream13831384if self.preserveUser:1385if not self.canChangeChangelists():1386die("Cannot preserve user names without p4 super-user or admin permissions")13871388if self.verbose:1389print"Origin branch is "+ self.origin13901391iflen(self.depotPath) ==0:1392print"Internal error: cannot locate perforce depot path from existing branches"1393 sys.exit(128)13941395 self.useClientSpec =False1396ifgitConfig("git-p4.useclientspec","--bool") =="true":1397 self.useClientSpec =True1398if self.useClientSpec:1399 self.clientSpecDirs =getClientSpec()14001401if self.useClientSpec:1402# all files are relative to the client spec1403 self.clientPath =getClientRoot()1404else:1405 self.clientPath =p4Where(self.depotPath)14061407if self.clientPath =="":1408die("Error: Cannot locate perforce checkout of%sin client view"% self.depotPath)14091410print"Perforce checkout for depot path%slocated at%s"% (self.depotPath, self.clientPath)1411 self.oldWorkingDirectory = os.getcwd()14121413# ensure the clientPath exists1414 new_client_dir =False1415if not os.path.exists(self.clientPath):1416 new_client_dir =True1417 os.makedirs(self.clientPath)14181419chdir(self.clientPath)1420print"Synchronizing p4 checkout..."1421if new_client_dir:1422# old one was destroyed, and maybe nobody told p41423p4_sync("...","-f")1424else:1425p4_sync("...")1426 self.check()14271428 commits = []1429for line inread_pipe_lines("git rev-list --no-merges%s..%s"% (self.origin, self.master)):1430 commits.append(line.strip())1431 commits.reverse()14321433if self.preserveUser or(gitConfig("git-p4.skipUserNameCheck") =="true"):1434 self.checkAuthorship =False1435else:1436 self.checkAuthorship =True14371438if self.preserveUser:1439 self.checkValidP4Users(commits)14401441#1442# Build up a set of options to be passed to diff when1443# submitting each commit to p4.1444#1445if self.detectRenames:1446# command-line -M arg1447 self.diffOpts ="-M"1448else:1449# If not explicitly set check the config variable1450 detectRenames =gitConfig("git-p4.detectRenames")14511452if detectRenames.lower() =="false"or detectRenames =="":1453 self.diffOpts =""1454elif detectRenames.lower() =="true":1455 self.diffOpts ="-M"1456else:1457 self.diffOpts ="-M%s"% detectRenames14581459# no command-line arg for -C or --find-copies-harder, just1460# config variables1461 detectCopies =gitConfig("git-p4.detectCopies")1462if detectCopies.lower() =="false"or detectCopies =="":1463pass1464elif detectCopies.lower() =="true":1465 self.diffOpts +=" -C"1466else:1467 self.diffOpts +=" -C%s"% detectCopies14681469ifgitConfig("git-p4.detectCopiesHarder","--bool") =="true":1470 self.diffOpts +=" --find-copies-harder"14711472#1473# Apply the commits, one at a time. On failure, ask if should1474# continue to try the rest of the patches, or quit.1475#1476 applied = []1477 last =len(commits) -11478for i, commit inenumerate(commits):1479 ok = self.applyCommit(commit)1480if ok:1481 applied.append(commit)1482else:1483if i < last:1484 quit =False1485while True:1486print"What do you want to do?"1487 response =raw_input("[s]kip this commit but apply"1488" the rest, or [q]uit? ")1489if not response:1490continue1491if response[0] =="s":1492print"Skipping this commit, but applying the rest"1493break1494if response[0] =="q":1495print"Quitting"1496 quit =True1497break1498if quit:1499break15001501chdir(self.oldWorkingDirectory)15021503iflen(commits) ==len(applied):1504print"All commits applied!"15051506 sync =P4Sync()1507 sync.run([])15081509 rebase =P4Rebase()1510 rebase.rebase()15111512else:1513iflen(applied) ==0:1514print"No commits applied."1515else:1516print"Applied only the commits marked with '*':"1517for c in commits:1518if c in applied:1519 star ="*"1520else:1521 star =" "1522print star,read_pipe(["git","show","-s",1523"--format=format:%h%s", c])1524print"You will have to do 'git p4 sync' and rebase."15251526ifgitConfig("git-p4.exportLabels","--bool") =="true":1527 self.exportLabels =True15281529if self.exportLabels:1530 p4Labels =getP4Labels(self.depotPath)1531 gitTags =getGitTags()15321533 missingGitTags = gitTags - p4Labels1534 self.exportGitTags(missingGitTags)15351536# exit with error unless everything applied perfecly1537iflen(commits) !=len(applied):1538 sys.exit(1)15391540return True15411542classView(object):1543"""Represent a p4 view ("p4 help views"), and map files in a1544 repo according to the view."""15451546classPath(object):1547"""A depot or client path, possibly containing wildcards.1548 The only one supported is ... at the end, currently.1549 Initialize with the full path, with //depot or //client."""15501551def__init__(self, path, is_depot):1552 self.path = path1553 self.is_depot = is_depot1554 self.find_wildcards()1555# remember the prefix bit, useful for relative mappings1556 m = re.match("(//[^/]+/)", self.path)1557if not m:1558die("Path%sdoes not start with //prefix/"% self.path)1559 prefix = m.group(1)1560if not self.is_depot:1561# strip //client/ on client paths1562 self.path = self.path[len(prefix):]15631564deffind_wildcards(self):1565"""Make sure wildcards are valid, and set up internal1566 variables."""15671568 self.ends_triple_dot =False1569# There are three wildcards allowed in p4 views1570# (see "p4 help views"). This code knows how to1571# handle "..." (only at the end), but cannot deal with1572# "%%n" or "*". Only check the depot_side, as p4 should1573# validate that the client_side matches too.1574if re.search(r'%%[1-9]', self.path):1575die("Can't handle%%n wildcards in view:%s"% self.path)1576if self.path.find("*") >=0:1577die("Can't handle * wildcards in view:%s"% self.path)1578 triple_dot_index = self.path.find("...")1579if triple_dot_index >=0:1580if triple_dot_index !=len(self.path) -3:1581die("Can handle only single ... wildcard, at end:%s"%1582 self.path)1583 self.ends_triple_dot =True15841585defensure_compatible(self, other_path):1586"""Make sure the wildcards agree."""1587if self.ends_triple_dot != other_path.ends_triple_dot:1588die("Both paths must end with ... if either does;\n"+1589"paths:%s %s"% (self.path, other_path.path))15901591defmatch_wildcards(self, test_path):1592"""See if this test_path matches us, and fill in the value1593 of the wildcards if so. Returns a tuple of1594 (True|False, wildcards[]). For now, only the ... at end1595 is supported, so at most one wildcard."""1596if self.ends_triple_dot:1597 dotless = self.path[:-3]1598if test_path.startswith(dotless):1599 wildcard = test_path[len(dotless):]1600return(True, [ wildcard ])1601else:1602if test_path == self.path:1603return(True, [])1604return(False, [])16051606defmatch(self, test_path):1607"""Just return if it matches; don't bother with the wildcards."""1608 b, _ = self.match_wildcards(test_path)1609return b16101611deffill_in_wildcards(self, wildcards):1612"""Return the relative path, with the wildcards filled in1613 if there are any."""1614if self.ends_triple_dot:1615return self.path[:-3] + wildcards[0]1616else:1617return self.path16181619classMapping(object):1620def__init__(self, depot_side, client_side, overlay, exclude):1621# depot_side is without the trailing /... if it had one1622 self.depot_side = View.Path(depot_side, is_depot=True)1623 self.client_side = View.Path(client_side, is_depot=False)1624 self.overlay = overlay # started with "+"1625 self.exclude = exclude # started with "-"1626assert not(self.overlay and self.exclude)1627 self.depot_side.ensure_compatible(self.client_side)16281629def__str__(self):1630 c =" "1631if self.overlay:1632 c ="+"1633if self.exclude:1634 c ="-"1635return"View.Mapping:%s%s->%s"% \1636(c, self.depot_side.path, self.client_side.path)16371638defmap_depot_to_client(self, depot_path):1639"""Calculate the client path if using this mapping on the1640 given depot path; does not consider the effect of other1641 mappings in a view. Even excluded mappings are returned."""1642 matches, wildcards = self.depot_side.match_wildcards(depot_path)1643if not matches:1644return""1645 client_path = self.client_side.fill_in_wildcards(wildcards)1646return client_path16471648#1649# View methods1650#1651def__init__(self):1652 self.mappings = []16531654defappend(self, view_line):1655"""Parse a view line, splitting it into depot and client1656 sides. Append to self.mappings, preserving order."""16571658# Split the view line into exactly two words. P4 enforces1659# structure on these lines that simplifies this quite a bit.1660#1661# Either or both words may be double-quoted.1662# Single quotes do not matter.1663# Double-quote marks cannot occur inside the words.1664# A + or - prefix is also inside the quotes.1665# There are no quotes unless they contain a space.1666# The line is already white-space stripped.1667# The two words are separated by a single space.1668#1669if view_line[0] =='"':1670# First word is double quoted. Find its end.1671 close_quote_index = view_line.find('"',1)1672if close_quote_index <=0:1673die("No first-word closing quote found:%s"% view_line)1674 depot_side = view_line[1:close_quote_index]1675# skip closing quote and space1676 rhs_index = close_quote_index +1+11677else:1678 space_index = view_line.find(" ")1679if space_index <=0:1680die("No word-splitting space found:%s"% view_line)1681 depot_side = view_line[0:space_index]1682 rhs_index = space_index +116831684if view_line[rhs_index] =='"':1685# Second word is double quoted. Make sure there is a1686# double quote at the end too.1687if not view_line.endswith('"'):1688die("View line with rhs quote should end with one:%s"%1689 view_line)1690# skip the quotes1691 client_side = view_line[rhs_index+1:-1]1692else:1693 client_side = view_line[rhs_index:]16941695# prefix + means overlay on previous mapping1696 overlay =False1697if depot_side.startswith("+"):1698 overlay =True1699 depot_side = depot_side[1:]17001701# prefix - means exclude this path1702 exclude =False1703if depot_side.startswith("-"):1704 exclude =True1705 depot_side = depot_side[1:]17061707 m = View.Mapping(depot_side, client_side, overlay, exclude)1708 self.mappings.append(m)17091710defmap_in_client(self, depot_path):1711"""Return the relative location in the client where this1712 depot file should live. Returns "" if the file should1713 not be mapped in the client."""17141715 paths_filled = []1716 client_path =""17171718# look at later entries first1719for m in self.mappings[::-1]:17201721# see where will this path end up in the client1722 p = m.map_depot_to_client(depot_path)17231724if p =="":1725# Depot path does not belong in client. Must remember1726# this, as previous items should not cause files to1727# exist in this path either. Remember that the list is1728# being walked from the end, which has higher precedence.1729# Overlap mappings do not exclude previous mappings.1730if not m.overlay:1731 paths_filled.append(m.client_side)17321733else:1734# This mapping matched; no need to search any further.1735# But, the mapping could be rejected if the client path1736# has already been claimed by an earlier mapping (i.e.1737# one later in the list, which we are walking backwards).1738 already_mapped_in_client =False1739for f in paths_filled:1740# this is View.Path.match1741if f.match(p):1742 already_mapped_in_client =True1743break1744if not already_mapped_in_client:1745# Include this file, unless it is from a line that1746# explicitly said to exclude it.1747if not m.exclude:1748 client_path = p17491750# a match, even if rejected, always stops the search1751break17521753return client_path17541755classP4Sync(Command, P4UserMap):1756 delete_actions = ("delete","move/delete","purge")17571758def__init__(self):1759 Command.__init__(self)1760 P4UserMap.__init__(self)1761 self.options = [1762 optparse.make_option("--branch", dest="branch"),1763 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),1764 optparse.make_option("--changesfile", dest="changesFile"),1765 optparse.make_option("--silent", dest="silent", action="store_true"),1766 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),1767 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),1768 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",1769help="Import into refs/heads/ , not refs/remotes"),1770 optparse.make_option("--max-changes", dest="maxChanges"),1771 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',1772help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),1773 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',1774help="Only sync files that are included in the Perforce Client Spec")1775]1776 self.description ="""Imports from Perforce into a git repository.\n1777 example:1778 //depot/my/project/ -- to import the current head1779 //depot/my/project/@all -- to import everything1780 //depot/my/project/@1,6 -- to import only from revision 1 to 617811782 (a ... is not needed in the path p4 specification, it's added implicitly)"""17831784 self.usage +=" //depot/path[@revRange]"1785 self.silent =False1786 self.createdBranches =set()1787 self.committedChanges =set()1788 self.branch =""1789 self.detectBranches =False1790 self.detectLabels =False1791 self.importLabels =False1792 self.changesFile =""1793 self.syncWithOrigin =True1794 self.importIntoRemotes =True1795 self.maxChanges =""1796 self.isWindows = (platform.system() =="Windows")1797 self.keepRepoPath =False1798 self.depotPaths =None1799 self.p4BranchesInGit = []1800 self.cloneExclude = []1801 self.useClientSpec =False1802 self.useClientSpec_from_options =False1803 self.clientSpecDirs =None1804 self.tempBranches = []1805 self.tempBranchLocation ="git-p4-tmp"18061807ifgitConfig("git-p4.syncFromOrigin") =="false":1808 self.syncWithOrigin =False18091810# Force a checkpoint in fast-import and wait for it to finish1811defcheckpoint(self):1812 self.gitStream.write("checkpoint\n\n")1813 self.gitStream.write("progress checkpoint\n\n")1814 out = self.gitOutput.readline()1815if self.verbose:1816print"checkpoint finished: "+ out18171818defextractFilesFromCommit(self, commit):1819 self.cloneExclude = [re.sub(r"\.\.\.$","", path)1820for path in self.cloneExclude]1821 files = []1822 fnum =01823while commit.has_key("depotFile%s"% fnum):1824 path = commit["depotFile%s"% fnum]18251826if[p for p in self.cloneExclude1827ifp4PathStartsWith(path, p)]:1828 found =False1829else:1830 found = [p for p in self.depotPaths1831ifp4PathStartsWith(path, p)]1832if not found:1833 fnum = fnum +11834continue18351836file= {}1837file["path"] = path1838file["rev"] = commit["rev%s"% fnum]1839file["action"] = commit["action%s"% fnum]1840file["type"] = commit["type%s"% fnum]1841 files.append(file)1842 fnum = fnum +11843return files18441845defstripRepoPath(self, path, prefixes):1846if self.useClientSpec:1847return self.clientSpecDirs.map_in_client(path)18481849if self.keepRepoPath:1850 prefixes = [re.sub("^(//[^/]+/).*", r'\1', prefixes[0])]18511852for p in prefixes:1853ifp4PathStartsWith(path, p):1854 path = path[len(p):]18551856return path18571858defsplitFilesIntoBranches(self, commit):1859 branches = {}1860 fnum =01861while commit.has_key("depotFile%s"% fnum):1862 path = commit["depotFile%s"% fnum]1863 found = [p for p in self.depotPaths1864ifp4PathStartsWith(path, p)]1865if not found:1866 fnum = fnum +11867continue18681869file= {}1870file["path"] = path1871file["rev"] = commit["rev%s"% fnum]1872file["action"] = commit["action%s"% fnum]1873file["type"] = commit["type%s"% fnum]1874 fnum = fnum +118751876 relPath = self.stripRepoPath(path, self.depotPaths)1877 relPath =wildcard_decode(relPath)18781879for branch in self.knownBranches.keys():18801881# add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.21882if relPath.startswith(branch +"/"):1883if branch not in branches:1884 branches[branch] = []1885 branches[branch].append(file)1886break18871888return branches18891890# output one file from the P4 stream1891# - helper for streamP4Files18921893defstreamOneP4File(self,file, contents):1894 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)1895 relPath =wildcard_decode(relPath)1896if verbose:1897 sys.stderr.write("%s\n"% relPath)18981899(type_base, type_mods) =split_p4_type(file["type"])19001901 git_mode ="100644"1902if"x"in type_mods:1903 git_mode ="100755"1904if type_base =="symlink":1905 git_mode ="120000"1906# p4 print on a symlink contains "target\n"; remove the newline1907 data =''.join(contents)1908 contents = [data[:-1]]19091910if type_base =="utf16":1911# p4 delivers different text in the python output to -G1912# than it does when using "print -o", or normal p4 client1913# operations. utf16 is converted to ascii or utf8, perhaps.1914# But ascii text saved as -t utf16 is completely mangled.1915# Invoke print -o to get the real contents.1916 text =p4_read_pipe(['print','-q','-o','-',file['depotFile']])1917 contents = [ text ]19181919if type_base =="apple":1920# Apple filetype files will be streamed as a concatenation of1921# its appledouble header and the contents. This is useless1922# on both macs and non-macs. If using "print -q -o xx", it1923# will create "xx" with the data, and "%xx" with the header.1924# This is also not very useful.1925#1926# Ideally, someday, this script can learn how to generate1927# appledouble files directly and import those to git, but1928# non-mac machines can never find a use for apple filetype.1929print"\nIgnoring apple filetype file%s"%file['depotFile']1930return19311932# Perhaps windows wants unicode, utf16 newlines translated too;1933# but this is not doing it.1934if self.isWindows and type_base =="text":1935 mangled = []1936for data in contents:1937 data = data.replace("\r\n","\n")1938 mangled.append(data)1939 contents = mangled19401941# Note that we do not try to de-mangle keywords on utf16 files,1942# even though in theory somebody may want that.1943 pattern =p4_keywords_regexp_for_type(type_base, type_mods)1944if pattern:1945 regexp = re.compile(pattern, re.VERBOSE)1946 text =''.join(contents)1947 text = regexp.sub(r'$\1$', text)1948 contents = [ text ]19491950 self.gitStream.write("M%sinline%s\n"% (git_mode, relPath))19511952# total length...1953 length =01954for d in contents:1955 length = length +len(d)19561957 self.gitStream.write("data%d\n"% length)1958for d in contents:1959 self.gitStream.write(d)1960 self.gitStream.write("\n")19611962defstreamOneP4Deletion(self,file):1963 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)1964 relPath =wildcard_decode(relPath)1965if verbose:1966 sys.stderr.write("delete%s\n"% relPath)1967 self.gitStream.write("D%s\n"% relPath)19681969# handle another chunk of streaming data1970defstreamP4FilesCb(self, marshalled):19711972if marshalled.has_key('depotFile')and self.stream_have_file_info:1973# start of a new file - output the old one first1974 self.streamOneP4File(self.stream_file, self.stream_contents)1975 self.stream_file = {}1976 self.stream_contents = []1977 self.stream_have_file_info =False19781979# pick up the new file information... for the1980# 'data' field we need to append to our array1981for k in marshalled.keys():1982if k =='data':1983 self.stream_contents.append(marshalled['data'])1984else:1985 self.stream_file[k] = marshalled[k]19861987 self.stream_have_file_info =True19881989# Stream directly from "p4 files" into "git fast-import"1990defstreamP4Files(self, files):1991 filesForCommit = []1992 filesToRead = []1993 filesToDelete = []19941995for f in files:1996# if using a client spec, only add the files that have1997# a path in the client1998if self.clientSpecDirs:1999if self.clientSpecDirs.map_in_client(f['path']) =="":2000continue20012002 filesForCommit.append(f)2003if f['action']in self.delete_actions:2004 filesToDelete.append(f)2005else:2006 filesToRead.append(f)20072008# deleted files...2009for f in filesToDelete:2010 self.streamOneP4Deletion(f)20112012iflen(filesToRead) >0:2013 self.stream_file = {}2014 self.stream_contents = []2015 self.stream_have_file_info =False20162017# curry self argument2018defstreamP4FilesCbSelf(entry):2019 self.streamP4FilesCb(entry)20202021 fileArgs = ['%s#%s'% (f['path'], f['rev'])for f in filesToRead]20222023p4CmdList(["-x","-","print"],2024 stdin=fileArgs,2025 cb=streamP4FilesCbSelf)20262027# do the last chunk2028if self.stream_file.has_key('depotFile'):2029 self.streamOneP4File(self.stream_file, self.stream_contents)20302031defmake_email(self, userid):2032if userid in self.users:2033return self.users[userid]2034else:2035return"%s<a@b>"% userid20362037# Stream a p4 tag2038defstreamTag(self, gitStream, labelName, labelDetails, commit, epoch):2039if verbose:2040print"writing tag%sfor commit%s"% (labelName, commit)2041 gitStream.write("tag%s\n"% labelName)2042 gitStream.write("from%s\n"% commit)20432044if labelDetails.has_key('Owner'):2045 owner = labelDetails["Owner"]2046else:2047 owner =None20482049# Try to use the owner of the p4 label, or failing that,2050# the current p4 user id.2051if owner:2052 email = self.make_email(owner)2053else:2054 email = self.make_email(self.p4UserId())2055 tagger ="%s %s %s"% (email, epoch, self.tz)20562057 gitStream.write("tagger%s\n"% tagger)20582059print"labelDetails=",labelDetails2060if labelDetails.has_key('Description'):2061 description = labelDetails['Description']2062else:2063 description ='Label from git p4'20642065 gitStream.write("data%d\n"%len(description))2066 gitStream.write(description)2067 gitStream.write("\n")20682069defcommit(self, details, files, branch, branchPrefixes, parent =""):2070 epoch = details["time"]2071 author = details["user"]2072 self.branchPrefixes = branchPrefixes20732074if self.verbose:2075print"commit into%s"% branch20762077# start with reading files; if that fails, we should not2078# create a commit.2079 new_files = []2080for f in files:2081if[p for p in branchPrefixes ifp4PathStartsWith(f['path'], p)]:2082 new_files.append(f)2083else:2084 sys.stderr.write("Ignoring file outside of prefix:%s\n"% f['path'])20852086 self.gitStream.write("commit%s\n"% branch)2087# gitStream.write("mark :%s\n" % details["change"])2088 self.committedChanges.add(int(details["change"]))2089 committer =""2090if author not in self.users:2091 self.getUserMapFromPerforceServer()2092 committer ="%s %s %s"% (self.make_email(author), epoch, self.tz)20932094 self.gitStream.write("committer%s\n"% committer)20952096 self.gitStream.write("data <<EOT\n")2097 self.gitStream.write(details["desc"])2098 self.gitStream.write("\n[git-p4: depot-paths =\"%s\": change =%s"2099% (','.join(branchPrefixes), details["change"]))2100iflen(details['options']) >0:2101 self.gitStream.write(": options =%s"% details['options'])2102 self.gitStream.write("]\nEOT\n\n")21032104iflen(parent) >0:2105if self.verbose:2106print"parent%s"% parent2107 self.gitStream.write("from%s\n"% parent)21082109 self.streamP4Files(new_files)2110 self.gitStream.write("\n")21112112 change =int(details["change"])21132114if self.labels.has_key(change):2115 label = self.labels[change]2116 labelDetails = label[0]2117 labelRevisions = label[1]2118if self.verbose:2119print"Change%sis labelled%s"% (change, labelDetails)21202121 files =p4CmdList(["files"] + ["%s...@%s"% (p, change)2122for p in branchPrefixes])21232124iflen(files) ==len(labelRevisions):21252126 cleanedFiles = {}2127for info in files:2128if info["action"]in self.delete_actions:2129continue2130 cleanedFiles[info["depotFile"]] = info["rev"]21312132if cleanedFiles == labelRevisions:2133 self.streamTag(self.gitStream,'tag_%s'% labelDetails['label'], labelDetails, branch, epoch)21342135else:2136if not self.silent:2137print("Tag%sdoes not match with change%s: files do not match."2138% (labelDetails["label"], change))21392140else:2141if not self.silent:2142print("Tag%sdoes not match with change%s: file count is different."2143% (labelDetails["label"], change))21442145# Build a dictionary of changelists and labels, for "detect-labels" option.2146defgetLabels(self):2147 self.labels = {}21482149 l =p4CmdList(["labels"] + ["%s..."% p for p in self.depotPaths])2150iflen(l) >0and not self.silent:2151print"Finding files belonging to labels in%s"% `self.depotPaths`21522153for output in l:2154 label = output["label"]2155 revisions = {}2156 newestChange =02157if self.verbose:2158print"Querying files for label%s"% label2159forfileinp4CmdList(["files"] +2160["%s...@%s"% (p, label)2161for p in self.depotPaths]):2162 revisions[file["depotFile"]] =file["rev"]2163 change =int(file["change"])2164if change > newestChange:2165 newestChange = change21662167 self.labels[newestChange] = [output, revisions]21682169if self.verbose:2170print"Label changes:%s"% self.labels.keys()21712172# Import p4 labels as git tags. A direct mapping does not2173# exist, so assume that if all the files are at the same revision2174# then we can use that, or it's something more complicated we should2175# just ignore.2176defimportP4Labels(self, stream, p4Labels):2177if verbose:2178print"import p4 labels: "+' '.join(p4Labels)21792180 ignoredP4Labels =gitConfigList("git-p4.ignoredP4Labels")2181 validLabelRegexp =gitConfig("git-p4.labelImportRegexp")2182iflen(validLabelRegexp) ==0:2183 validLabelRegexp = defaultLabelRegexp2184 m = re.compile(validLabelRegexp)21852186for name in p4Labels:2187 commitFound =False21882189if not m.match(name):2190if verbose:2191print"label%sdoes not match regexp%s"% (name,validLabelRegexp)2192continue21932194if name in ignoredP4Labels:2195continue21962197 labelDetails =p4CmdList(['label',"-o", name])[0]21982199# get the most recent changelist for each file in this label2200 change =p4Cmd(["changes","-m","1"] + ["%s...@%s"% (p, name)2201for p in self.depotPaths])22022203if change.has_key('change'):2204# find the corresponding git commit; take the oldest commit2205 changelist =int(change['change'])2206 gitCommit =read_pipe(["git","rev-list","--max-count=1",2207"--reverse",":/\[git-p4:.*change =%d\]"% changelist])2208iflen(gitCommit) ==0:2209print"could not find git commit for changelist%d"% changelist2210else:2211 gitCommit = gitCommit.strip()2212 commitFound =True2213# Convert from p4 time format2214try:2215 tmwhen = time.strptime(labelDetails['Update'],"%Y/%m/%d%H:%M:%S")2216exceptValueError:2217print"Could not convert label time%s"% labelDetail['Update']2218 tmwhen =122192220 when =int(time.mktime(tmwhen))2221 self.streamTag(stream, name, labelDetails, gitCommit, when)2222if verbose:2223print"p4 label%smapped to git commit%s"% (name, gitCommit)2224else:2225if verbose:2226print"Label%shas no changelists - possibly deleted?"% name22272228if not commitFound:2229# We can't import this label; don't try again as it will get very2230# expensive repeatedly fetching all the files for labels that will2231# never be imported. If the label is moved in the future, the2232# ignore will need to be removed manually.2233system(["git","config","--add","git-p4.ignoredP4Labels", name])22342235defguessProjectName(self):2236for p in self.depotPaths:2237if p.endswith("/"):2238 p = p[:-1]2239 p = p[p.strip().rfind("/") +1:]2240if not p.endswith("/"):2241 p +="/"2242return p22432244defgetBranchMapping(self):2245 lostAndFoundBranches =set()22462247 user =gitConfig("git-p4.branchUser")2248iflen(user) >0:2249 command ="branches -u%s"% user2250else:2251 command ="branches"22522253for info inp4CmdList(command):2254 details =p4Cmd(["branch","-o", info["branch"]])2255 viewIdx =02256while details.has_key("View%s"% viewIdx):2257 paths = details["View%s"% viewIdx].split(" ")2258 viewIdx = viewIdx +12259# require standard //depot/foo/... //depot/bar/... mapping2260iflen(paths) !=2or not paths[0].endswith("/...")or not paths[1].endswith("/..."):2261continue2262 source = paths[0]2263 destination = paths[1]2264## HACK2265ifp4PathStartsWith(source, self.depotPaths[0])andp4PathStartsWith(destination, self.depotPaths[0]):2266 source = source[len(self.depotPaths[0]):-4]2267 destination = destination[len(self.depotPaths[0]):-4]22682269if destination in self.knownBranches:2270if not self.silent:2271print"p4 branch%sdefines a mapping from%sto%s"% (info["branch"], source, destination)2272print"but there exists another mapping from%sto%salready!"% (self.knownBranches[destination], destination)2273continue22742275 self.knownBranches[destination] = source22762277 lostAndFoundBranches.discard(destination)22782279if source not in self.knownBranches:2280 lostAndFoundBranches.add(source)22812282# Perforce does not strictly require branches to be defined, so we also2283# check git config for a branch list.2284#2285# Example of branch definition in git config file:2286# [git-p4]2287# branchList=main:branchA2288# branchList=main:branchB2289# branchList=branchA:branchC2290 configBranches =gitConfigList("git-p4.branchList")2291for branch in configBranches:2292if branch:2293(source, destination) = branch.split(":")2294 self.knownBranches[destination] = source22952296 lostAndFoundBranches.discard(destination)22972298if source not in self.knownBranches:2299 lostAndFoundBranches.add(source)230023012302for branch in lostAndFoundBranches:2303 self.knownBranches[branch] = branch23042305defgetBranchMappingFromGitBranches(self):2306 branches =p4BranchesInGit(self.importIntoRemotes)2307for branch in branches.keys():2308if branch =="master":2309 branch ="main"2310else:2311 branch = branch[len(self.projectName):]2312 self.knownBranches[branch] = branch23132314deflistExistingP4GitBranches(self):2315# branches holds mapping from name to commit2316 branches =p4BranchesInGit(self.importIntoRemotes)2317 self.p4BranchesInGit = branches.keys()2318for branch in branches.keys():2319 self.initialParents[self.refPrefix + branch] = branches[branch]23202321defupdateOptionDict(self, d):2322 option_keys = {}2323if self.keepRepoPath:2324 option_keys['keepRepoPath'] =123252326 d["options"] =' '.join(sorted(option_keys.keys()))23272328defreadOptions(self, d):2329 self.keepRepoPath = (d.has_key('options')2330and('keepRepoPath'in d['options']))23312332defgitRefForBranch(self, branch):2333if branch =="main":2334return self.refPrefix +"master"23352336iflen(branch) <=0:2337return branch23382339return self.refPrefix + self.projectName + branch23402341defgitCommitByP4Change(self, ref, change):2342if self.verbose:2343print"looking in ref "+ ref +" for change%susing bisect..."% change23442345 earliestCommit =""2346 latestCommit =parseRevision(ref)23472348while True:2349if self.verbose:2350print"trying: earliest%slatest%s"% (earliestCommit, latestCommit)2351 next =read_pipe("git rev-list --bisect%s %s"% (latestCommit, earliestCommit)).strip()2352iflen(next) ==0:2353if self.verbose:2354print"argh"2355return""2356 log =extractLogMessageFromGitCommit(next)2357 settings =extractSettingsGitLog(log)2358 currentChange =int(settings['change'])2359if self.verbose:2360print"current change%s"% currentChange23612362if currentChange == change:2363if self.verbose:2364print"found%s"% next2365return next23662367if currentChange < change:2368 earliestCommit ="^%s"% next2369else:2370 latestCommit ="%s"% next23712372return""23732374defimportNewBranch(self, branch, maxChange):2375# make fast-import flush all changes to disk and update the refs using the checkpoint2376# command so that we can try to find the branch parent in the git history2377 self.gitStream.write("checkpoint\n\n");2378 self.gitStream.flush();2379 branchPrefix = self.depotPaths[0] + branch +"/"2380range="@1,%s"% maxChange2381#print "prefix" + branchPrefix2382 changes =p4ChangesForPaths([branchPrefix],range)2383iflen(changes) <=0:2384return False2385 firstChange = changes[0]2386#print "first change in branch: %s" % firstChange2387 sourceBranch = self.knownBranches[branch]2388 sourceDepotPath = self.depotPaths[0] + sourceBranch2389 sourceRef = self.gitRefForBranch(sourceBranch)2390#print "source " + sourceBranch23912392 branchParentChange =int(p4Cmd(["changes","-m","1","%s...@1,%s"% (sourceDepotPath, firstChange)])["change"])2393#print "branch parent: %s" % branchParentChange2394 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)2395iflen(gitParent) >0:2396 self.initialParents[self.gitRefForBranch(branch)] = gitParent2397#print "parent git commit: %s" % gitParent23982399 self.importChanges(changes)2400return True24012402defsearchParent(self, parent, branch, target):2403 parentFound =False2404for blob inread_pipe_lines(["git","rev-list","--reverse","--no-merges", parent]):2405 blob = blob.strip()2406iflen(read_pipe(["git","diff-tree", blob, target])) ==0:2407 parentFound =True2408if self.verbose:2409print"Found parent of%sin commit%s"% (branch, blob)2410break2411if parentFound:2412return blob2413else:2414return None24152416defimportChanges(self, changes):2417 cnt =12418for change in changes:2419 description =p4Cmd(["describe",str(change)])2420 self.updateOptionDict(description)24212422if not self.silent:2423 sys.stdout.write("\rImporting revision%s(%s%%)"% (change, cnt *100/len(changes)))2424 sys.stdout.flush()2425 cnt = cnt +124262427try:2428if self.detectBranches:2429 branches = self.splitFilesIntoBranches(description)2430for branch in branches.keys():2431## HACK --hwn2432 branchPrefix = self.depotPaths[0] + branch +"/"24332434 parent =""24352436 filesForCommit = branches[branch]24372438if self.verbose:2439print"branch is%s"% branch24402441 self.updatedBranches.add(branch)24422443if branch not in self.createdBranches:2444 self.createdBranches.add(branch)2445 parent = self.knownBranches[branch]2446if parent == branch:2447 parent =""2448else:2449 fullBranch = self.projectName + branch2450if fullBranch not in self.p4BranchesInGit:2451if not self.silent:2452print("\nImporting new branch%s"% fullBranch);2453if self.importNewBranch(branch, change -1):2454 parent =""2455 self.p4BranchesInGit.append(fullBranch)2456if not self.silent:2457print("\nResuming with change%s"% change);24582459if self.verbose:2460print"parent determined through known branches:%s"% parent24612462 branch = self.gitRefForBranch(branch)2463 parent = self.gitRefForBranch(parent)24642465if self.verbose:2466print"looking for initial parent for%s; current parent is%s"% (branch, parent)24672468iflen(parent) ==0and branch in self.initialParents:2469 parent = self.initialParents[branch]2470del self.initialParents[branch]24712472 blob =None2473iflen(parent) >0:2474 tempBranch = os.path.join(self.tempBranchLocation,"%d"% (change))2475if self.verbose:2476print"Creating temporary branch: "+ tempBranch2477 self.commit(description, filesForCommit, tempBranch, [branchPrefix])2478 self.tempBranches.append(tempBranch)2479 self.checkpoint()2480 blob = self.searchParent(parent, branch, tempBranch)2481if blob:2482 self.commit(description, filesForCommit, branch, [branchPrefix], blob)2483else:2484if self.verbose:2485print"Parent of%snot found. Committing into head of%s"% (branch, parent)2486 self.commit(description, filesForCommit, branch, [branchPrefix], parent)2487else:2488 files = self.extractFilesFromCommit(description)2489 self.commit(description, files, self.branch, self.depotPaths,2490 self.initialParent)2491 self.initialParent =""2492exceptIOError:2493print self.gitError.read()2494 sys.exit(1)24952496defimportHeadRevision(self, revision):2497print"Doing initial import of%sfrom revision%sinto%s"% (' '.join(self.depotPaths), revision, self.branch)24982499 details = {}2500 details["user"] ="git perforce import user"2501 details["desc"] = ("Initial import of%sfrom the state at revision%s\n"2502% (' '.join(self.depotPaths), revision))2503 details["change"] = revision2504 newestRevision =025052506 fileCnt =02507 fileArgs = ["%s...%s"% (p,revision)for p in self.depotPaths]25082509for info inp4CmdList(["files"] + fileArgs):25102511if'code'in info and info['code'] =='error':2512 sys.stderr.write("p4 returned an error:%s\n"2513% info['data'])2514if info['data'].find("must refer to client") >=0:2515 sys.stderr.write("This particular p4 error is misleading.\n")2516 sys.stderr.write("Perhaps the depot path was misspelled.\n");2517 sys.stderr.write("Depot path:%s\n"%" ".join(self.depotPaths))2518 sys.exit(1)2519if'p4ExitCode'in info:2520 sys.stderr.write("p4 exitcode:%s\n"% info['p4ExitCode'])2521 sys.exit(1)252225232524 change =int(info["change"])2525if change > newestRevision:2526 newestRevision = change25272528if info["action"]in self.delete_actions:2529# don't increase the file cnt, otherwise details["depotFile123"] will have gaps!2530#fileCnt = fileCnt + 12531continue25322533for prop in["depotFile","rev","action","type"]:2534 details["%s%s"% (prop, fileCnt)] = info[prop]25352536 fileCnt = fileCnt +125372538 details["change"] = newestRevision25392540# Use time from top-most change so that all git p4 clones of2541# the same p4 repo have the same commit SHA1s.2542 res =p4CmdList("describe -s%d"% newestRevision)2543 newestTime =None2544for r in res:2545if r.has_key('time'):2546 newestTime =int(r['time'])2547if newestTime is None:2548die("\"describe -s\"on newest change%ddid not give a time")2549 details["time"] = newestTime25502551 self.updateOptionDict(details)2552try:2553 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPaths)2554exceptIOError:2555print"IO error with git fast-import. Is your git version recent enough?"2556print self.gitError.read()255725582559defrun(self, args):2560 self.depotPaths = []2561 self.changeRange =""2562 self.initialParent =""2563 self.previousDepotPaths = []25642565# map from branch depot path to parent branch2566 self.knownBranches = {}2567 self.initialParents = {}2568 self.hasOrigin =originP4BranchesExist()2569if not self.syncWithOrigin:2570 self.hasOrigin =False25712572if self.importIntoRemotes:2573 self.refPrefix ="refs/remotes/p4/"2574else:2575 self.refPrefix ="refs/heads/p4/"25762577if self.syncWithOrigin and self.hasOrigin:2578if not self.silent:2579print"Syncing with origin first by calling git fetch origin"2580system("git fetch origin")25812582iflen(self.branch) ==0:2583 self.branch = self.refPrefix +"master"2584ifgitBranchExists("refs/heads/p4")and self.importIntoRemotes:2585system("git update-ref%srefs/heads/p4"% self.branch)2586system("git branch -D p4");2587# create it /after/ importing, when master exists2588if notgitBranchExists(self.refPrefix +"HEAD")and self.importIntoRemotes andgitBranchExists(self.branch):2589system("git symbolic-ref%sHEAD%s"% (self.refPrefix, self.branch))25902591# accept either the command-line option, or the configuration variable2592if self.useClientSpec:2593# will use this after clone to set the variable2594 self.useClientSpec_from_options =True2595else:2596ifgitConfig("git-p4.useclientspec","--bool") =="true":2597 self.useClientSpec =True2598if self.useClientSpec:2599 self.clientSpecDirs =getClientSpec()26002601# TODO: should always look at previous commits,2602# merge with previous imports, if possible.2603if args == []:2604if self.hasOrigin:2605createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)2606 self.listExistingP4GitBranches()26072608iflen(self.p4BranchesInGit) >1:2609if not self.silent:2610print"Importing from/into multiple branches"2611 self.detectBranches =True26122613if self.verbose:2614print"branches:%s"% self.p4BranchesInGit26152616 p4Change =02617for branch in self.p4BranchesInGit:2618 logMsg =extractLogMessageFromGitCommit(self.refPrefix + branch)26192620 settings =extractSettingsGitLog(logMsg)26212622 self.readOptions(settings)2623if(settings.has_key('depot-paths')2624and settings.has_key('change')):2625 change =int(settings['change']) +12626 p4Change =max(p4Change, change)26272628 depotPaths =sorted(settings['depot-paths'])2629if self.previousDepotPaths == []:2630 self.previousDepotPaths = depotPaths2631else:2632 paths = []2633for(prev, cur)inzip(self.previousDepotPaths, depotPaths):2634 prev_list = prev.split("/")2635 cur_list = cur.split("/")2636for i inrange(0,min(len(cur_list),len(prev_list))):2637if cur_list[i] <> prev_list[i]:2638 i = i -12639break26402641 paths.append("/".join(cur_list[:i +1]))26422643 self.previousDepotPaths = paths26442645if p4Change >0:2646 self.depotPaths =sorted(self.previousDepotPaths)2647 self.changeRange ="@%s,#head"% p4Change2648if not self.detectBranches:2649 self.initialParent =parseRevision(self.branch)2650if not self.silent and not self.detectBranches:2651print"Performing incremental import into%sgit branch"% self.branch26522653if not self.branch.startswith("refs/"):2654 self.branch ="refs/heads/"+ self.branch26552656iflen(args) ==0and self.depotPaths:2657if not self.silent:2658print"Depot paths:%s"%' '.join(self.depotPaths)2659else:2660if self.depotPaths and self.depotPaths != args:2661print("previous import used depot path%sand now%swas specified. "2662"This doesn't work!"% (' '.join(self.depotPaths),2663' '.join(args)))2664 sys.exit(1)26652666 self.depotPaths =sorted(args)26672668 revision =""2669 self.users = {}26702671# Make sure no revision specifiers are used when --changesfile2672# is specified.2673 bad_changesfile =False2674iflen(self.changesFile) >0:2675for p in self.depotPaths:2676if p.find("@") >=0or p.find("#") >=0:2677 bad_changesfile =True2678break2679if bad_changesfile:2680die("Option --changesfile is incompatible with revision specifiers")26812682 newPaths = []2683for p in self.depotPaths:2684if p.find("@") != -1:2685 atIdx = p.index("@")2686 self.changeRange = p[atIdx:]2687if self.changeRange =="@all":2688 self.changeRange =""2689elif','not in self.changeRange:2690 revision = self.changeRange2691 self.changeRange =""2692 p = p[:atIdx]2693elif p.find("#") != -1:2694 hashIdx = p.index("#")2695 revision = p[hashIdx:]2696 p = p[:hashIdx]2697elif self.previousDepotPaths == []:2698# pay attention to changesfile, if given, else import2699# the entire p4 tree at the head revision2700iflen(self.changesFile) ==0:2701 revision ="#head"27022703 p = re.sub("\.\.\.$","", p)2704if not p.endswith("/"):2705 p +="/"27062707 newPaths.append(p)27082709 self.depotPaths = newPaths27102711 self.loadUserMapFromCache()2712 self.labels = {}2713if self.detectLabels:2714 self.getLabels();27152716if self.detectBranches:2717## FIXME - what's a P4 projectName ?2718 self.projectName = self.guessProjectName()27192720if self.hasOrigin:2721 self.getBranchMappingFromGitBranches()2722else:2723 self.getBranchMapping()2724if self.verbose:2725print"p4-git branches:%s"% self.p4BranchesInGit2726print"initial parents:%s"% self.initialParents2727for b in self.p4BranchesInGit:2728if b !="master":27292730## FIXME2731 b = b[len(self.projectName):]2732 self.createdBranches.add(b)27332734 self.tz ="%+03d%02d"% (- time.timezone /3600, ((- time.timezone %3600) /60))27352736 importProcess = subprocess.Popen(["git","fast-import"],2737 stdin=subprocess.PIPE, stdout=subprocess.PIPE,2738 stderr=subprocess.PIPE);2739 self.gitOutput = importProcess.stdout2740 self.gitStream = importProcess.stdin2741 self.gitError = importProcess.stderr27422743if revision:2744 self.importHeadRevision(revision)2745else:2746 changes = []27472748iflen(self.changesFile) >0:2749 output =open(self.changesFile).readlines()2750 changeSet =set()2751for line in output:2752 changeSet.add(int(line))27532754for change in changeSet:2755 changes.append(change)27562757 changes.sort()2758else:2759# catch "git p4 sync" with no new branches, in a repo that2760# does not have any existing p4 branches2761iflen(args) ==0and not self.p4BranchesInGit:2762die("No remote p4 branches. Perhaps you never did\"git p4 clone\"in here.");2763if self.verbose:2764print"Getting p4 changes for%s...%s"% (', '.join(self.depotPaths),2765 self.changeRange)2766 changes =p4ChangesForPaths(self.depotPaths, self.changeRange)27672768iflen(self.maxChanges) >0:2769 changes = changes[:min(int(self.maxChanges),len(changes))]27702771iflen(changes) ==0:2772if not self.silent:2773print"No changes to import!"2774else:2775if not self.silent and not self.detectBranches:2776print"Import destination:%s"% self.branch27772778 self.updatedBranches =set()27792780 self.importChanges(changes)27812782if not self.silent:2783print""2784iflen(self.updatedBranches) >0:2785 sys.stdout.write("Updated branches: ")2786for b in self.updatedBranches:2787 sys.stdout.write("%s"% b)2788 sys.stdout.write("\n")27892790ifgitConfig("git-p4.importLabels","--bool") =="true":2791 self.importLabels =True27922793if self.importLabels:2794 p4Labels =getP4Labels(self.depotPaths)2795 gitTags =getGitTags()27962797 missingP4Labels = p4Labels - gitTags2798 self.importP4Labels(self.gitStream, missingP4Labels)27992800 self.gitStream.close()2801if importProcess.wait() !=0:2802die("fast-import failed:%s"% self.gitError.read())2803 self.gitOutput.close()2804 self.gitError.close()28052806# Cleanup temporary branches created during import2807if self.tempBranches != []:2808for branch in self.tempBranches:2809read_pipe("git update-ref -d%s"% branch)2810 os.rmdir(os.path.join(os.environ.get("GIT_DIR",".git"), self.tempBranchLocation))28112812return True28132814classP4Rebase(Command):2815def__init__(self):2816 Command.__init__(self)2817 self.options = [2818 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),2819]2820 self.importLabels =False2821 self.description = ("Fetches the latest revision from perforce and "2822+"rebases the current work (branch) against it")28232824defrun(self, args):2825 sync =P4Sync()2826 sync.importLabels = self.importLabels2827 sync.run([])28282829return self.rebase()28302831defrebase(self):2832if os.system("git update-index --refresh") !=0:2833die("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.");2834iflen(read_pipe("git diff-index HEAD --")) >0:2835die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash.");28362837[upstream, settings] =findUpstreamBranchPoint()2838iflen(upstream) ==0:2839die("Cannot find upstream branchpoint for rebase")28402841# the branchpoint may be p4/foo~3, so strip off the parent2842 upstream = re.sub("~[0-9]+$","", upstream)28432844print"Rebasing the current branch onto%s"% upstream2845 oldHead =read_pipe("git rev-parse HEAD").strip()2846system("git rebase%s"% upstream)2847system("git diff-tree --stat --summary -M%sHEAD"% oldHead)2848return True28492850classP4Clone(P4Sync):2851def__init__(self):2852 P4Sync.__init__(self)2853 self.description ="Creates a new git repository and imports from Perforce into it"2854 self.usage ="usage: %prog [options] //depot/path[@revRange]"2855 self.options += [2856 optparse.make_option("--destination", dest="cloneDestination",2857 action='store', default=None,2858help="where to leave result of the clone"),2859 optparse.make_option("-/", dest="cloneExclude",2860 action="append",type="string",2861help="exclude depot path"),2862 optparse.make_option("--bare", dest="cloneBare",2863 action="store_true", default=False),2864]2865 self.cloneDestination =None2866 self.needsGit =False2867 self.cloneBare =False28682869# This is required for the "append" cloneExclude action2870defensure_value(self, attr, value):2871if nothasattr(self, attr)orgetattr(self, attr)is None:2872setattr(self, attr, value)2873returngetattr(self, attr)28742875defdefaultDestination(self, args):2876## TODO: use common prefix of args?2877 depotPath = args[0]2878 depotDir = re.sub("(@[^@]*)$","", depotPath)2879 depotDir = re.sub("(#[^#]*)$","", depotDir)2880 depotDir = re.sub(r"\.\.\.$","", depotDir)2881 depotDir = re.sub(r"/$","", depotDir)2882return os.path.split(depotDir)[1]28832884defrun(self, args):2885iflen(args) <1:2886return False28872888if self.keepRepoPath and not self.cloneDestination:2889 sys.stderr.write("Must specify destination for --keep-path\n")2890 sys.exit(1)28912892 depotPaths = args28932894if not self.cloneDestination andlen(depotPaths) >1:2895 self.cloneDestination = depotPaths[-1]2896 depotPaths = depotPaths[:-1]28972898 self.cloneExclude = ["/"+p for p in self.cloneExclude]2899for p in depotPaths:2900if not p.startswith("//"):2901return False29022903if not self.cloneDestination:2904 self.cloneDestination = self.defaultDestination(args)29052906print"Importing from%sinto%s"% (', '.join(depotPaths), self.cloneDestination)29072908if not os.path.exists(self.cloneDestination):2909 os.makedirs(self.cloneDestination)2910chdir(self.cloneDestination)29112912 init_cmd = ["git","init"]2913if self.cloneBare:2914 init_cmd.append("--bare")2915 subprocess.check_call(init_cmd)29162917if not P4Sync.run(self, depotPaths):2918return False2919if self.branch !="master":2920if self.importIntoRemotes:2921 masterbranch ="refs/remotes/p4/master"2922else:2923 masterbranch ="refs/heads/p4/master"2924ifgitBranchExists(masterbranch):2925system("git branch master%s"% masterbranch)2926if not self.cloneBare:2927system("git checkout -f")2928else:2929print"Could not detect main branch. No checkout/master branch created."29302931# auto-set this variable if invoked with --use-client-spec2932if self.useClientSpec_from_options:2933system("git config --bool git-p4.useclientspec true")29342935return True29362937classP4Branches(Command):2938def__init__(self):2939 Command.__init__(self)2940 self.options = [ ]2941 self.description = ("Shows the git branches that hold imports and their "2942+"corresponding perforce depot paths")2943 self.verbose =False29442945defrun(self, args):2946iforiginP4BranchesExist():2947createOrUpdateBranchesFromOrigin()29482949 cmdline ="git rev-parse --symbolic "2950 cmdline +=" --remotes"29512952for line inread_pipe_lines(cmdline):2953 line = line.strip()29542955if not line.startswith('p4/')or line =="p4/HEAD":2956continue2957 branch = line29582959 log =extractLogMessageFromGitCommit("refs/remotes/%s"% branch)2960 settings =extractSettingsGitLog(log)29612962print"%s<=%s(%s)"% (branch,",".join(settings["depot-paths"]), settings["change"])2963return True29642965classHelpFormatter(optparse.IndentedHelpFormatter):2966def__init__(self):2967 optparse.IndentedHelpFormatter.__init__(self)29682969defformat_description(self, description):2970if description:2971return description +"\n"2972else:2973return""29742975defprintUsage(commands):2976print"usage:%s<command> [options]"% sys.argv[0]2977print""2978print"valid commands:%s"%", ".join(commands)2979print""2980print"Try%s<command> --help for command specific help."% sys.argv[0]2981print""29822983commands = {2984"debug": P4Debug,2985"submit": P4Submit,2986"commit": P4Submit,2987"sync": P4Sync,2988"rebase": P4Rebase,2989"clone": P4Clone,2990"rollback": P4RollBack,2991"branches": P4Branches2992}299329942995defmain():2996iflen(sys.argv[1:]) ==0:2997printUsage(commands.keys())2998 sys.exit(2)29993000 cmd =""3001 cmdName = sys.argv[1]3002try:3003 klass = commands[cmdName]3004 cmd =klass()3005exceptKeyError:3006print"unknown command%s"% cmdName3007print""3008printUsage(commands.keys())3009 sys.exit(2)30103011 options = cmd.options3012 cmd.gitdir = os.environ.get("GIT_DIR",None)30133014 args = sys.argv[2:]30153016 options.append(optparse.make_option("--verbose", dest="verbose", action="store_true"))3017if cmd.needsGit:3018 options.append(optparse.make_option("--git-dir", dest="gitdir"))30193020 parser = optparse.OptionParser(cmd.usage.replace("%prog","%prog "+ cmdName),3021 options,3022 description = cmd.description,3023 formatter =HelpFormatter())30243025(cmd, args) = parser.parse_args(sys.argv[2:], cmd);3026global verbose3027 verbose = cmd.verbose3028if cmd.needsGit:3029if cmd.gitdir ==None:3030 cmd.gitdir = os.path.abspath(".git")3031if notisValidGitDir(cmd.gitdir):3032 cmd.gitdir =read_pipe("git rev-parse --git-dir").strip()3033if os.path.exists(cmd.gitdir):3034 cdup =read_pipe("git rev-parse --show-cdup").strip()3035iflen(cdup) >0:3036chdir(cdup);30373038if notisValidGitDir(cmd.gitdir):3039ifisValidGitDir(cmd.gitdir +"/.git"):3040 cmd.gitdir +="/.git"3041else:3042die("fatal: cannot locate git repository at%s"% cmd.gitdir)30433044 os.environ["GIT_DIR"] = cmd.gitdir30453046if not cmd.run(args):3047 parser.print_help()3048 sys.exit(2)304930503051if __name__ =='__main__':3052main()