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)1203for f in filesToAdd:1204 os.remove(f)1205return False12061207system(applyPatchCmd)12081209for f in filesToAdd:1210p4_add(f)1211for f in filesToDelete:1212p4_revert(f)1213p4_delete(f)12141215# Set/clear executable bits1216for f in filesToChangeExecBit.keys():1217 mode = filesToChangeExecBit[f]1218setP4ExecBit(f, mode)12191220 logMessage =extractLogMessageFromGitCommit(id)1221 logMessage = logMessage.strip()1222(logMessage, jobs) = self.separate_jobs_from_description(logMessage)12231224 template = self.prepareSubmitTemplate()1225 submitTemplate = self.prepareLogMessage(template, logMessage, jobs)12261227if self.preserveUser:1228 submitTemplate = submitTemplate + ("\n######## Actual user%s, modified after commit\n"% p4User)12291230if os.environ.has_key("P4DIFF"):1231del(os.environ["P4DIFF"])1232 diff =""1233for editedFile in editedFiles:1234 diff +=p4_read_pipe(['diff','-du',1235wildcard_encode(editedFile)])12361237 newdiff =""1238for newFile in filesToAdd:1239 newdiff +="==== new file ====\n"1240 newdiff +="--- /dev/null\n"1241 newdiff +="+++%s\n"% newFile1242 f =open(newFile,"r")1243for line in f.readlines():1244 newdiff +="+"+ line1245 f.close()12461247if self.checkAuthorship and not self.p4UserIsMe(p4User):1248 submitTemplate +="######## git author%sdoes not match your p4 account.\n"% gitEmail1249 submitTemplate +="######## Use option --preserve-user to modify authorship.\n"1250 submitTemplate +="######## Variable git-p4.skipUserNameCheck hides this message.\n"12511252 separatorLine ="######## everything below this line is just the diff #######\n"12531254(handle, fileName) = tempfile.mkstemp()1255 tmpFile = os.fdopen(handle,"w+")1256if self.isWindows:1257 submitTemplate = submitTemplate.replace("\n","\r\n")1258 separatorLine = separatorLine.replace("\n","\r\n")1259 newdiff = newdiff.replace("\n","\r\n")1260 tmpFile.write(submitTemplate + separatorLine + diff + newdiff)1261 tmpFile.close()12621263if self.edit_template(fileName):1264# read the edited message and submit1265 ret =True1266 tmpFile =open(fileName,"rb")1267 message = tmpFile.read()1268 tmpFile.close()1269 submitTemplate = message[:message.index(separatorLine)]1270if self.isWindows:1271 submitTemplate = submitTemplate.replace("\r\n","\n")1272p4_write_pipe(['submit','-i'], submitTemplate)12731274if self.preserveUser:1275if p4User:1276# Get last changelist number. Cannot easily get it from1277# the submit command output as the output is1278# unmarshalled.1279 changelist = self.lastP4Changelist()1280 self.modifyChangelistUser(changelist, p4User)12811282# The rename/copy happened by applying a patch that created a1283# new file. This leaves it writable, which confuses p4.1284for f in pureRenameCopy:1285p4_sync(f,"-f")12861287else:1288# skip this patch1289 ret =False1290print"Submission cancelled, undoing p4 changes."1291for f in editedFiles:1292p4_revert(f)1293for f in filesToAdd:1294p4_revert(f)1295 os.remove(f)12961297 os.remove(fileName)1298return ret12991300# Export git tags as p4 labels. Create a p4 label and then tag1301# with that.1302defexportGitTags(self, gitTags):1303 validLabelRegexp =gitConfig("git-p4.labelExportRegexp")1304iflen(validLabelRegexp) ==0:1305 validLabelRegexp = defaultLabelRegexp1306 m = re.compile(validLabelRegexp)13071308for name in gitTags:13091310if not m.match(name):1311if verbose:1312print"tag%sdoes not match regexp%s"% (name, validLabelRegexp)1313continue13141315# Get the p4 commit this corresponds to1316 logMessage =extractLogMessageFromGitCommit(name)1317 values =extractSettingsGitLog(logMessage)13181319if not values.has_key('change'):1320# a tag pointing to something not sent to p4; ignore1321if verbose:1322print"git tag%sdoes not give a p4 commit"% name1323continue1324else:1325 changelist = values['change']13261327# Get the tag details.1328 inHeader =True1329 isAnnotated =False1330 body = []1331for l inread_pipe_lines(["git","cat-file","-p", name]):1332 l = l.strip()1333if inHeader:1334if re.match(r'tag\s+', l):1335 isAnnotated =True1336elif re.match(r'\s*$', l):1337 inHeader =False1338continue1339else:1340 body.append(l)13411342if not isAnnotated:1343 body = ["lightweight tag imported by git p4\n"]13441345# Create the label - use the same view as the client spec we are using1346 clientSpec =getClientSpec()13471348 labelTemplate ="Label:%s\n"% name1349 labelTemplate +="Description:\n"1350for b in body:1351 labelTemplate +="\t"+ b +"\n"1352 labelTemplate +="View:\n"1353for mapping in clientSpec.mappings:1354 labelTemplate +="\t%s\n"% mapping.depot_side.path13551356p4_write_pipe(["label","-i"], labelTemplate)13571358# Use the label1359p4_system(["tag","-l", name] +1360["%s@%s"% (mapping.depot_side.path, changelist)for mapping in clientSpec.mappings])13611362if verbose:1363print"created p4 label for tag%s"% name13641365defrun(self, args):1366iflen(args) ==0:1367 self.master =currentGitBranch()1368iflen(self.master) ==0or notgitBranchExists("refs/heads/%s"% self.master):1369die("Detecting current git branch failed!")1370eliflen(args) ==1:1371 self.master = args[0]1372if notbranchExists(self.master):1373die("Branch%sdoes not exist"% self.master)1374else:1375return False13761377 allowSubmit =gitConfig("git-p4.allowSubmit")1378iflen(allowSubmit) >0and not self.master in allowSubmit.split(","):1379die("%sis not in git-p4.allowSubmit"% self.master)13801381[upstream, settings] =findUpstreamBranchPoint()1382 self.depotPath = settings['depot-paths'][0]1383iflen(self.origin) ==0:1384 self.origin = upstream13851386if self.preserveUser:1387if not self.canChangeChangelists():1388die("Cannot preserve user names without p4 super-user or admin permissions")13891390if self.verbose:1391print"Origin branch is "+ self.origin13921393iflen(self.depotPath) ==0:1394print"Internal error: cannot locate perforce depot path from existing branches"1395 sys.exit(128)13961397 self.useClientSpec =False1398ifgitConfig("git-p4.useclientspec","--bool") =="true":1399 self.useClientSpec =True1400if self.useClientSpec:1401 self.clientSpecDirs =getClientSpec()14021403if self.useClientSpec:1404# all files are relative to the client spec1405 self.clientPath =getClientRoot()1406else:1407 self.clientPath =p4Where(self.depotPath)14081409if self.clientPath =="":1410die("Error: Cannot locate perforce checkout of%sin client view"% self.depotPath)14111412print"Perforce checkout for depot path%slocated at%s"% (self.depotPath, self.clientPath)1413 self.oldWorkingDirectory = os.getcwd()14141415# ensure the clientPath exists1416 new_client_dir =False1417if not os.path.exists(self.clientPath):1418 new_client_dir =True1419 os.makedirs(self.clientPath)14201421chdir(self.clientPath)1422print"Synchronizing p4 checkout..."1423if new_client_dir:1424# old one was destroyed, and maybe nobody told p41425p4_sync("...","-f")1426else:1427p4_sync("...")1428 self.check()14291430 commits = []1431for line inread_pipe_lines("git rev-list --no-merges%s..%s"% (self.origin, self.master)):1432 commits.append(line.strip())1433 commits.reverse()14341435if self.preserveUser or(gitConfig("git-p4.skipUserNameCheck") =="true"):1436 self.checkAuthorship =False1437else:1438 self.checkAuthorship =True14391440if self.preserveUser:1441 self.checkValidP4Users(commits)14421443#1444# Build up a set of options to be passed to diff when1445# submitting each commit to p4.1446#1447if self.detectRenames:1448# command-line -M arg1449 self.diffOpts ="-M"1450else:1451# If not explicitly set check the config variable1452 detectRenames =gitConfig("git-p4.detectRenames")14531454if detectRenames.lower() =="false"or detectRenames =="":1455 self.diffOpts =""1456elif detectRenames.lower() =="true":1457 self.diffOpts ="-M"1458else:1459 self.diffOpts ="-M%s"% detectRenames14601461# no command-line arg for -C or --find-copies-harder, just1462# config variables1463 detectCopies =gitConfig("git-p4.detectCopies")1464if detectCopies.lower() =="false"or detectCopies =="":1465pass1466elif detectCopies.lower() =="true":1467 self.diffOpts +=" -C"1468else:1469 self.diffOpts +=" -C%s"% detectCopies14701471ifgitConfig("git-p4.detectCopiesHarder","--bool") =="true":1472 self.diffOpts +=" --find-copies-harder"14731474#1475# Apply the commits, one at a time. On failure, ask if should1476# continue to try the rest of the patches, or quit.1477#1478 applied = []1479 last =len(commits) -11480for i, commit inenumerate(commits):1481 ok = self.applyCommit(commit)1482if ok:1483 applied.append(commit)1484else:1485if i < last:1486 quit =False1487while True:1488print"What do you want to do?"1489 response =raw_input("[s]kip this commit but apply"1490" the rest, or [q]uit? ")1491if not response:1492continue1493if response[0] =="s":1494print"Skipping this commit, but applying the rest"1495break1496if response[0] =="q":1497print"Quitting"1498 quit =True1499break1500if quit:1501break15021503chdir(self.oldWorkingDirectory)15041505iflen(commits) ==len(applied):1506print"All commits applied!"15071508 sync =P4Sync()1509 sync.run([])15101511 rebase =P4Rebase()1512 rebase.rebase()15131514else:1515iflen(applied) ==0:1516print"No commits applied."1517else:1518print"Applied only the commits marked with '*':"1519for c in commits:1520if c in applied:1521 star ="*"1522else:1523 star =" "1524print star,read_pipe(["git","show","-s",1525"--format=format:%h%s", c])1526print"You will have to do 'git p4 sync' and rebase."15271528ifgitConfig("git-p4.exportLabels","--bool") =="true":1529 self.exportLabels =True15301531if self.exportLabels:1532 p4Labels =getP4Labels(self.depotPath)1533 gitTags =getGitTags()15341535 missingGitTags = gitTags - p4Labels1536 self.exportGitTags(missingGitTags)15371538# exit with error unless everything applied perfecly1539iflen(commits) !=len(applied):1540 sys.exit(1)15411542return True15431544classView(object):1545"""Represent a p4 view ("p4 help views"), and map files in a1546 repo according to the view."""15471548classPath(object):1549"""A depot or client path, possibly containing wildcards.1550 The only one supported is ... at the end, currently.1551 Initialize with the full path, with //depot or //client."""15521553def__init__(self, path, is_depot):1554 self.path = path1555 self.is_depot = is_depot1556 self.find_wildcards()1557# remember the prefix bit, useful for relative mappings1558 m = re.match("(//[^/]+/)", self.path)1559if not m:1560die("Path%sdoes not start with //prefix/"% self.path)1561 prefix = m.group(1)1562if not self.is_depot:1563# strip //client/ on client paths1564 self.path = self.path[len(prefix):]15651566deffind_wildcards(self):1567"""Make sure wildcards are valid, and set up internal1568 variables."""15691570 self.ends_triple_dot =False1571# There are three wildcards allowed in p4 views1572# (see "p4 help views"). This code knows how to1573# handle "..." (only at the end), but cannot deal with1574# "%%n" or "*". Only check the depot_side, as p4 should1575# validate that the client_side matches too.1576if re.search(r'%%[1-9]', self.path):1577die("Can't handle%%n wildcards in view:%s"% self.path)1578if self.path.find("*") >=0:1579die("Can't handle * wildcards in view:%s"% self.path)1580 triple_dot_index = self.path.find("...")1581if triple_dot_index >=0:1582if triple_dot_index !=len(self.path) -3:1583die("Can handle only single ... wildcard, at end:%s"%1584 self.path)1585 self.ends_triple_dot =True15861587defensure_compatible(self, other_path):1588"""Make sure the wildcards agree."""1589if self.ends_triple_dot != other_path.ends_triple_dot:1590die("Both paths must end with ... if either does;\n"+1591"paths:%s %s"% (self.path, other_path.path))15921593defmatch_wildcards(self, test_path):1594"""See if this test_path matches us, and fill in the value1595 of the wildcards if so. Returns a tuple of1596 (True|False, wildcards[]). For now, only the ... at end1597 is supported, so at most one wildcard."""1598if self.ends_triple_dot:1599 dotless = self.path[:-3]1600if test_path.startswith(dotless):1601 wildcard = test_path[len(dotless):]1602return(True, [ wildcard ])1603else:1604if test_path == self.path:1605return(True, [])1606return(False, [])16071608defmatch(self, test_path):1609"""Just return if it matches; don't bother with the wildcards."""1610 b, _ = self.match_wildcards(test_path)1611return b16121613deffill_in_wildcards(self, wildcards):1614"""Return the relative path, with the wildcards filled in1615 if there are any."""1616if self.ends_triple_dot:1617return self.path[:-3] + wildcards[0]1618else:1619return self.path16201621classMapping(object):1622def__init__(self, depot_side, client_side, overlay, exclude):1623# depot_side is without the trailing /... if it had one1624 self.depot_side = View.Path(depot_side, is_depot=True)1625 self.client_side = View.Path(client_side, is_depot=False)1626 self.overlay = overlay # started with "+"1627 self.exclude = exclude # started with "-"1628assert not(self.overlay and self.exclude)1629 self.depot_side.ensure_compatible(self.client_side)16301631def__str__(self):1632 c =" "1633if self.overlay:1634 c ="+"1635if self.exclude:1636 c ="-"1637return"View.Mapping:%s%s->%s"% \1638(c, self.depot_side.path, self.client_side.path)16391640defmap_depot_to_client(self, depot_path):1641"""Calculate the client path if using this mapping on the1642 given depot path; does not consider the effect of other1643 mappings in a view. Even excluded mappings are returned."""1644 matches, wildcards = self.depot_side.match_wildcards(depot_path)1645if not matches:1646return""1647 client_path = self.client_side.fill_in_wildcards(wildcards)1648return client_path16491650#1651# View methods1652#1653def__init__(self):1654 self.mappings = []16551656defappend(self, view_line):1657"""Parse a view line, splitting it into depot and client1658 sides. Append to self.mappings, preserving order."""16591660# Split the view line into exactly two words. P4 enforces1661# structure on these lines that simplifies this quite a bit.1662#1663# Either or both words may be double-quoted.1664# Single quotes do not matter.1665# Double-quote marks cannot occur inside the words.1666# A + or - prefix is also inside the quotes.1667# There are no quotes unless they contain a space.1668# The line is already white-space stripped.1669# The two words are separated by a single space.1670#1671if view_line[0] =='"':1672# First word is double quoted. Find its end.1673 close_quote_index = view_line.find('"',1)1674if close_quote_index <=0:1675die("No first-word closing quote found:%s"% view_line)1676 depot_side = view_line[1:close_quote_index]1677# skip closing quote and space1678 rhs_index = close_quote_index +1+11679else:1680 space_index = view_line.find(" ")1681if space_index <=0:1682die("No word-splitting space found:%s"% view_line)1683 depot_side = view_line[0:space_index]1684 rhs_index = space_index +116851686if view_line[rhs_index] =='"':1687# Second word is double quoted. Make sure there is a1688# double quote at the end too.1689if not view_line.endswith('"'):1690die("View line with rhs quote should end with one:%s"%1691 view_line)1692# skip the quotes1693 client_side = view_line[rhs_index+1:-1]1694else:1695 client_side = view_line[rhs_index:]16961697# prefix + means overlay on previous mapping1698 overlay =False1699if depot_side.startswith("+"):1700 overlay =True1701 depot_side = depot_side[1:]17021703# prefix - means exclude this path1704 exclude =False1705if depot_side.startswith("-"):1706 exclude =True1707 depot_side = depot_side[1:]17081709 m = View.Mapping(depot_side, client_side, overlay, exclude)1710 self.mappings.append(m)17111712defmap_in_client(self, depot_path):1713"""Return the relative location in the client where this1714 depot file should live. Returns "" if the file should1715 not be mapped in the client."""17161717 paths_filled = []1718 client_path =""17191720# look at later entries first1721for m in self.mappings[::-1]:17221723# see where will this path end up in the client1724 p = m.map_depot_to_client(depot_path)17251726if p =="":1727# Depot path does not belong in client. Must remember1728# this, as previous items should not cause files to1729# exist in this path either. Remember that the list is1730# being walked from the end, which has higher precedence.1731# Overlap mappings do not exclude previous mappings.1732if not m.overlay:1733 paths_filled.append(m.client_side)17341735else:1736# This mapping matched; no need to search any further.1737# But, the mapping could be rejected if the client path1738# has already been claimed by an earlier mapping (i.e.1739# one later in the list, which we are walking backwards).1740 already_mapped_in_client =False1741for f in paths_filled:1742# this is View.Path.match1743if f.match(p):1744 already_mapped_in_client =True1745break1746if not already_mapped_in_client:1747# Include this file, unless it is from a line that1748# explicitly said to exclude it.1749if not m.exclude:1750 client_path = p17511752# a match, even if rejected, always stops the search1753break17541755return client_path17561757classP4Sync(Command, P4UserMap):1758 delete_actions = ("delete","move/delete","purge")17591760def__init__(self):1761 Command.__init__(self)1762 P4UserMap.__init__(self)1763 self.options = [1764 optparse.make_option("--branch", dest="branch"),1765 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),1766 optparse.make_option("--changesfile", dest="changesFile"),1767 optparse.make_option("--silent", dest="silent", action="store_true"),1768 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),1769 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),1770 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",1771help="Import into refs/heads/ , not refs/remotes"),1772 optparse.make_option("--max-changes", dest="maxChanges"),1773 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',1774help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),1775 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',1776help="Only sync files that are included in the Perforce Client Spec")1777]1778 self.description ="""Imports from Perforce into a git repository.\n1779 example:1780 //depot/my/project/ -- to import the current head1781 //depot/my/project/@all -- to import everything1782 //depot/my/project/@1,6 -- to import only from revision 1 to 617831784 (a ... is not needed in the path p4 specification, it's added implicitly)"""17851786 self.usage +=" //depot/path[@revRange]"1787 self.silent =False1788 self.createdBranches =set()1789 self.committedChanges =set()1790 self.branch =""1791 self.detectBranches =False1792 self.detectLabels =False1793 self.importLabels =False1794 self.changesFile =""1795 self.syncWithOrigin =True1796 self.importIntoRemotes =True1797 self.maxChanges =""1798 self.isWindows = (platform.system() =="Windows")1799 self.keepRepoPath =False1800 self.depotPaths =None1801 self.p4BranchesInGit = []1802 self.cloneExclude = []1803 self.useClientSpec =False1804 self.useClientSpec_from_options =False1805 self.clientSpecDirs =None1806 self.tempBranches = []1807 self.tempBranchLocation ="git-p4-tmp"18081809ifgitConfig("git-p4.syncFromOrigin") =="false":1810 self.syncWithOrigin =False18111812# Force a checkpoint in fast-import and wait for it to finish1813defcheckpoint(self):1814 self.gitStream.write("checkpoint\n\n")1815 self.gitStream.write("progress checkpoint\n\n")1816 out = self.gitOutput.readline()1817if self.verbose:1818print"checkpoint finished: "+ out18191820defextractFilesFromCommit(self, commit):1821 self.cloneExclude = [re.sub(r"\.\.\.$","", path)1822for path in self.cloneExclude]1823 files = []1824 fnum =01825while commit.has_key("depotFile%s"% fnum):1826 path = commit["depotFile%s"% fnum]18271828if[p for p in self.cloneExclude1829ifp4PathStartsWith(path, p)]:1830 found =False1831else:1832 found = [p for p in self.depotPaths1833ifp4PathStartsWith(path, p)]1834if not found:1835 fnum = fnum +11836continue18371838file= {}1839file["path"] = path1840file["rev"] = commit["rev%s"% fnum]1841file["action"] = commit["action%s"% fnum]1842file["type"] = commit["type%s"% fnum]1843 files.append(file)1844 fnum = fnum +11845return files18461847defstripRepoPath(self, path, prefixes):1848if self.useClientSpec:1849return self.clientSpecDirs.map_in_client(path)18501851if self.keepRepoPath:1852 prefixes = [re.sub("^(//[^/]+/).*", r'\1', prefixes[0])]18531854for p in prefixes:1855ifp4PathStartsWith(path, p):1856 path = path[len(p):]18571858return path18591860defsplitFilesIntoBranches(self, commit):1861 branches = {}1862 fnum =01863while commit.has_key("depotFile%s"% fnum):1864 path = commit["depotFile%s"% fnum]1865 found = [p for p in self.depotPaths1866ifp4PathStartsWith(path, p)]1867if not found:1868 fnum = fnum +11869continue18701871file= {}1872file["path"] = path1873file["rev"] = commit["rev%s"% fnum]1874file["action"] = commit["action%s"% fnum]1875file["type"] = commit["type%s"% fnum]1876 fnum = fnum +118771878 relPath = self.stripRepoPath(path, self.depotPaths)1879 relPath =wildcard_decode(relPath)18801881for branch in self.knownBranches.keys():18821883# add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.21884if relPath.startswith(branch +"/"):1885if branch not in branches:1886 branches[branch] = []1887 branches[branch].append(file)1888break18891890return branches18911892# output one file from the P4 stream1893# - helper for streamP4Files18941895defstreamOneP4File(self,file, contents):1896 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)1897 relPath =wildcard_decode(relPath)1898if verbose:1899 sys.stderr.write("%s\n"% relPath)19001901(type_base, type_mods) =split_p4_type(file["type"])19021903 git_mode ="100644"1904if"x"in type_mods:1905 git_mode ="100755"1906if type_base =="symlink":1907 git_mode ="120000"1908# p4 print on a symlink contains "target\n"; remove the newline1909 data =''.join(contents)1910 contents = [data[:-1]]19111912if type_base =="utf16":1913# p4 delivers different text in the python output to -G1914# than it does when using "print -o", or normal p4 client1915# operations. utf16 is converted to ascii or utf8, perhaps.1916# But ascii text saved as -t utf16 is completely mangled.1917# Invoke print -o to get the real contents.1918 text =p4_read_pipe(['print','-q','-o','-',file['depotFile']])1919 contents = [ text ]19201921if type_base =="apple":1922# Apple filetype files will be streamed as a concatenation of1923# its appledouble header and the contents. This is useless1924# on both macs and non-macs. If using "print -q -o xx", it1925# will create "xx" with the data, and "%xx" with the header.1926# This is also not very useful.1927#1928# Ideally, someday, this script can learn how to generate1929# appledouble files directly and import those to git, but1930# non-mac machines can never find a use for apple filetype.1931print"\nIgnoring apple filetype file%s"%file['depotFile']1932return19331934# Perhaps windows wants unicode, utf16 newlines translated too;1935# but this is not doing it.1936if self.isWindows and type_base =="text":1937 mangled = []1938for data in contents:1939 data = data.replace("\r\n","\n")1940 mangled.append(data)1941 contents = mangled19421943# Note that we do not try to de-mangle keywords on utf16 files,1944# even though in theory somebody may want that.1945 pattern =p4_keywords_regexp_for_type(type_base, type_mods)1946if pattern:1947 regexp = re.compile(pattern, re.VERBOSE)1948 text =''.join(contents)1949 text = regexp.sub(r'$\1$', text)1950 contents = [ text ]19511952 self.gitStream.write("M%sinline%s\n"% (git_mode, relPath))19531954# total length...1955 length =01956for d in contents:1957 length = length +len(d)19581959 self.gitStream.write("data%d\n"% length)1960for d in contents:1961 self.gitStream.write(d)1962 self.gitStream.write("\n")19631964defstreamOneP4Deletion(self,file):1965 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)1966 relPath =wildcard_decode(relPath)1967if verbose:1968 sys.stderr.write("delete%s\n"% relPath)1969 self.gitStream.write("D%s\n"% relPath)19701971# handle another chunk of streaming data1972defstreamP4FilesCb(self, marshalled):19731974if marshalled.has_key('depotFile')and self.stream_have_file_info:1975# start of a new file - output the old one first1976 self.streamOneP4File(self.stream_file, self.stream_contents)1977 self.stream_file = {}1978 self.stream_contents = []1979 self.stream_have_file_info =False19801981# pick up the new file information... for the1982# 'data' field we need to append to our array1983for k in marshalled.keys():1984if k =='data':1985 self.stream_contents.append(marshalled['data'])1986else:1987 self.stream_file[k] = marshalled[k]19881989 self.stream_have_file_info =True19901991# Stream directly from "p4 files" into "git fast-import"1992defstreamP4Files(self, files):1993 filesForCommit = []1994 filesToRead = []1995 filesToDelete = []19961997for f in files:1998# if using a client spec, only add the files that have1999# a path in the client2000if self.clientSpecDirs:2001if self.clientSpecDirs.map_in_client(f['path']) =="":2002continue20032004 filesForCommit.append(f)2005if f['action']in self.delete_actions:2006 filesToDelete.append(f)2007else:2008 filesToRead.append(f)20092010# deleted files...2011for f in filesToDelete:2012 self.streamOneP4Deletion(f)20132014iflen(filesToRead) >0:2015 self.stream_file = {}2016 self.stream_contents = []2017 self.stream_have_file_info =False20182019# curry self argument2020defstreamP4FilesCbSelf(entry):2021 self.streamP4FilesCb(entry)20222023 fileArgs = ['%s#%s'% (f['path'], f['rev'])for f in filesToRead]20242025p4CmdList(["-x","-","print"],2026 stdin=fileArgs,2027 cb=streamP4FilesCbSelf)20282029# do the last chunk2030if self.stream_file.has_key('depotFile'):2031 self.streamOneP4File(self.stream_file, self.stream_contents)20322033defmake_email(self, userid):2034if userid in self.users:2035return self.users[userid]2036else:2037return"%s<a@b>"% userid20382039# Stream a p4 tag2040defstreamTag(self, gitStream, labelName, labelDetails, commit, epoch):2041if verbose:2042print"writing tag%sfor commit%s"% (labelName, commit)2043 gitStream.write("tag%s\n"% labelName)2044 gitStream.write("from%s\n"% commit)20452046if labelDetails.has_key('Owner'):2047 owner = labelDetails["Owner"]2048else:2049 owner =None20502051# Try to use the owner of the p4 label, or failing that,2052# the current p4 user id.2053if owner:2054 email = self.make_email(owner)2055else:2056 email = self.make_email(self.p4UserId())2057 tagger ="%s %s %s"% (email, epoch, self.tz)20582059 gitStream.write("tagger%s\n"% tagger)20602061print"labelDetails=",labelDetails2062if labelDetails.has_key('Description'):2063 description = labelDetails['Description']2064else:2065 description ='Label from git p4'20662067 gitStream.write("data%d\n"%len(description))2068 gitStream.write(description)2069 gitStream.write("\n")20702071defcommit(self, details, files, branch, branchPrefixes, parent =""):2072 epoch = details["time"]2073 author = details["user"]2074 self.branchPrefixes = branchPrefixes20752076if self.verbose:2077print"commit into%s"% branch20782079# start with reading files; if that fails, we should not2080# create a commit.2081 new_files = []2082for f in files:2083if[p for p in branchPrefixes ifp4PathStartsWith(f['path'], p)]:2084 new_files.append(f)2085else:2086 sys.stderr.write("Ignoring file outside of prefix:%s\n"% f['path'])20872088 self.gitStream.write("commit%s\n"% branch)2089# gitStream.write("mark :%s\n" % details["change"])2090 self.committedChanges.add(int(details["change"]))2091 committer =""2092if author not in self.users:2093 self.getUserMapFromPerforceServer()2094 committer ="%s %s %s"% (self.make_email(author), epoch, self.tz)20952096 self.gitStream.write("committer%s\n"% committer)20972098 self.gitStream.write("data <<EOT\n")2099 self.gitStream.write(details["desc"])2100 self.gitStream.write("\n[git-p4: depot-paths =\"%s\": change =%s"2101% (','.join(branchPrefixes), details["change"]))2102iflen(details['options']) >0:2103 self.gitStream.write(": options =%s"% details['options'])2104 self.gitStream.write("]\nEOT\n\n")21052106iflen(parent) >0:2107if self.verbose:2108print"parent%s"% parent2109 self.gitStream.write("from%s\n"% parent)21102111 self.streamP4Files(new_files)2112 self.gitStream.write("\n")21132114 change =int(details["change"])21152116if self.labels.has_key(change):2117 label = self.labels[change]2118 labelDetails = label[0]2119 labelRevisions = label[1]2120if self.verbose:2121print"Change%sis labelled%s"% (change, labelDetails)21222123 files =p4CmdList(["files"] + ["%s...@%s"% (p, change)2124for p in branchPrefixes])21252126iflen(files) ==len(labelRevisions):21272128 cleanedFiles = {}2129for info in files:2130if info["action"]in self.delete_actions:2131continue2132 cleanedFiles[info["depotFile"]] = info["rev"]21332134if cleanedFiles == labelRevisions:2135 self.streamTag(self.gitStream,'tag_%s'% labelDetails['label'], labelDetails, branch, epoch)21362137else:2138if not self.silent:2139print("Tag%sdoes not match with change%s: files do not match."2140% (labelDetails["label"], change))21412142else:2143if not self.silent:2144print("Tag%sdoes not match with change%s: file count is different."2145% (labelDetails["label"], change))21462147# Build a dictionary of changelists and labels, for "detect-labels" option.2148defgetLabels(self):2149 self.labels = {}21502151 l =p4CmdList(["labels"] + ["%s..."% p for p in self.depotPaths])2152iflen(l) >0and not self.silent:2153print"Finding files belonging to labels in%s"% `self.depotPaths`21542155for output in l:2156 label = output["label"]2157 revisions = {}2158 newestChange =02159if self.verbose:2160print"Querying files for label%s"% label2161forfileinp4CmdList(["files"] +2162["%s...@%s"% (p, label)2163for p in self.depotPaths]):2164 revisions[file["depotFile"]] =file["rev"]2165 change =int(file["change"])2166if change > newestChange:2167 newestChange = change21682169 self.labels[newestChange] = [output, revisions]21702171if self.verbose:2172print"Label changes:%s"% self.labels.keys()21732174# Import p4 labels as git tags. A direct mapping does not2175# exist, so assume that if all the files are at the same revision2176# then we can use that, or it's something more complicated we should2177# just ignore.2178defimportP4Labels(self, stream, p4Labels):2179if verbose:2180print"import p4 labels: "+' '.join(p4Labels)21812182 ignoredP4Labels =gitConfigList("git-p4.ignoredP4Labels")2183 validLabelRegexp =gitConfig("git-p4.labelImportRegexp")2184iflen(validLabelRegexp) ==0:2185 validLabelRegexp = defaultLabelRegexp2186 m = re.compile(validLabelRegexp)21872188for name in p4Labels:2189 commitFound =False21902191if not m.match(name):2192if verbose:2193print"label%sdoes not match regexp%s"% (name,validLabelRegexp)2194continue21952196if name in ignoredP4Labels:2197continue21982199 labelDetails =p4CmdList(['label',"-o", name])[0]22002201# get the most recent changelist for each file in this label2202 change =p4Cmd(["changes","-m","1"] + ["%s...@%s"% (p, name)2203for p in self.depotPaths])22042205if change.has_key('change'):2206# find the corresponding git commit; take the oldest commit2207 changelist =int(change['change'])2208 gitCommit =read_pipe(["git","rev-list","--max-count=1",2209"--reverse",":/\[git-p4:.*change =%d\]"% changelist])2210iflen(gitCommit) ==0:2211print"could not find git commit for changelist%d"% changelist2212else:2213 gitCommit = gitCommit.strip()2214 commitFound =True2215# Convert from p4 time format2216try:2217 tmwhen = time.strptime(labelDetails['Update'],"%Y/%m/%d%H:%M:%S")2218exceptValueError:2219print"Could not convert label time%s"% labelDetail['Update']2220 tmwhen =122212222 when =int(time.mktime(tmwhen))2223 self.streamTag(stream, name, labelDetails, gitCommit, when)2224if verbose:2225print"p4 label%smapped to git commit%s"% (name, gitCommit)2226else:2227if verbose:2228print"Label%shas no changelists - possibly deleted?"% name22292230if not commitFound:2231# We can't import this label; don't try again as it will get very2232# expensive repeatedly fetching all the files for labels that will2233# never be imported. If the label is moved in the future, the2234# ignore will need to be removed manually.2235system(["git","config","--add","git-p4.ignoredP4Labels", name])22362237defguessProjectName(self):2238for p in self.depotPaths:2239if p.endswith("/"):2240 p = p[:-1]2241 p = p[p.strip().rfind("/") +1:]2242if not p.endswith("/"):2243 p +="/"2244return p22452246defgetBranchMapping(self):2247 lostAndFoundBranches =set()22482249 user =gitConfig("git-p4.branchUser")2250iflen(user) >0:2251 command ="branches -u%s"% user2252else:2253 command ="branches"22542255for info inp4CmdList(command):2256 details =p4Cmd(["branch","-o", info["branch"]])2257 viewIdx =02258while details.has_key("View%s"% viewIdx):2259 paths = details["View%s"% viewIdx].split(" ")2260 viewIdx = viewIdx +12261# require standard //depot/foo/... //depot/bar/... mapping2262iflen(paths) !=2or not paths[0].endswith("/...")or not paths[1].endswith("/..."):2263continue2264 source = paths[0]2265 destination = paths[1]2266## HACK2267ifp4PathStartsWith(source, self.depotPaths[0])andp4PathStartsWith(destination, self.depotPaths[0]):2268 source = source[len(self.depotPaths[0]):-4]2269 destination = destination[len(self.depotPaths[0]):-4]22702271if destination in self.knownBranches:2272if not self.silent:2273print"p4 branch%sdefines a mapping from%sto%s"% (info["branch"], source, destination)2274print"but there exists another mapping from%sto%salready!"% (self.knownBranches[destination], destination)2275continue22762277 self.knownBranches[destination] = source22782279 lostAndFoundBranches.discard(destination)22802281if source not in self.knownBranches:2282 lostAndFoundBranches.add(source)22832284# Perforce does not strictly require branches to be defined, so we also2285# check git config for a branch list.2286#2287# Example of branch definition in git config file:2288# [git-p4]2289# branchList=main:branchA2290# branchList=main:branchB2291# branchList=branchA:branchC2292 configBranches =gitConfigList("git-p4.branchList")2293for branch in configBranches:2294if branch:2295(source, destination) = branch.split(":")2296 self.knownBranches[destination] = source22972298 lostAndFoundBranches.discard(destination)22992300if source not in self.knownBranches:2301 lostAndFoundBranches.add(source)230223032304for branch in lostAndFoundBranches:2305 self.knownBranches[branch] = branch23062307defgetBranchMappingFromGitBranches(self):2308 branches =p4BranchesInGit(self.importIntoRemotes)2309for branch in branches.keys():2310if branch =="master":2311 branch ="main"2312else:2313 branch = branch[len(self.projectName):]2314 self.knownBranches[branch] = branch23152316deflistExistingP4GitBranches(self):2317# branches holds mapping from name to commit2318 branches =p4BranchesInGit(self.importIntoRemotes)2319 self.p4BranchesInGit = branches.keys()2320for branch in branches.keys():2321 self.initialParents[self.refPrefix + branch] = branches[branch]23222323defupdateOptionDict(self, d):2324 option_keys = {}2325if self.keepRepoPath:2326 option_keys['keepRepoPath'] =123272328 d["options"] =' '.join(sorted(option_keys.keys()))23292330defreadOptions(self, d):2331 self.keepRepoPath = (d.has_key('options')2332and('keepRepoPath'in d['options']))23332334defgitRefForBranch(self, branch):2335if branch =="main":2336return self.refPrefix +"master"23372338iflen(branch) <=0:2339return branch23402341return self.refPrefix + self.projectName + branch23422343defgitCommitByP4Change(self, ref, change):2344if self.verbose:2345print"looking in ref "+ ref +" for change%susing bisect..."% change23462347 earliestCommit =""2348 latestCommit =parseRevision(ref)23492350while True:2351if self.verbose:2352print"trying: earliest%slatest%s"% (earliestCommit, latestCommit)2353 next =read_pipe("git rev-list --bisect%s %s"% (latestCommit, earliestCommit)).strip()2354iflen(next) ==0:2355if self.verbose:2356print"argh"2357return""2358 log =extractLogMessageFromGitCommit(next)2359 settings =extractSettingsGitLog(log)2360 currentChange =int(settings['change'])2361if self.verbose:2362print"current change%s"% currentChange23632364if currentChange == change:2365if self.verbose:2366print"found%s"% next2367return next23682369if currentChange < change:2370 earliestCommit ="^%s"% next2371else:2372 latestCommit ="%s"% next23732374return""23752376defimportNewBranch(self, branch, maxChange):2377# make fast-import flush all changes to disk and update the refs using the checkpoint2378# command so that we can try to find the branch parent in the git history2379 self.gitStream.write("checkpoint\n\n");2380 self.gitStream.flush();2381 branchPrefix = self.depotPaths[0] + branch +"/"2382range="@1,%s"% maxChange2383#print "prefix" + branchPrefix2384 changes =p4ChangesForPaths([branchPrefix],range)2385iflen(changes) <=0:2386return False2387 firstChange = changes[0]2388#print "first change in branch: %s" % firstChange2389 sourceBranch = self.knownBranches[branch]2390 sourceDepotPath = self.depotPaths[0] + sourceBranch2391 sourceRef = self.gitRefForBranch(sourceBranch)2392#print "source " + sourceBranch23932394 branchParentChange =int(p4Cmd(["changes","-m","1","%s...@1,%s"% (sourceDepotPath, firstChange)])["change"])2395#print "branch parent: %s" % branchParentChange2396 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)2397iflen(gitParent) >0:2398 self.initialParents[self.gitRefForBranch(branch)] = gitParent2399#print "parent git commit: %s" % gitParent24002401 self.importChanges(changes)2402return True24032404defsearchParent(self, parent, branch, target):2405 parentFound =False2406for blob inread_pipe_lines(["git","rev-list","--reverse","--no-merges", parent]):2407 blob = blob.strip()2408iflen(read_pipe(["git","diff-tree", blob, target])) ==0:2409 parentFound =True2410if self.verbose:2411print"Found parent of%sin commit%s"% (branch, blob)2412break2413if parentFound:2414return blob2415else:2416return None24172418defimportChanges(self, changes):2419 cnt =12420for change in changes:2421 description =p4Cmd(["describe",str(change)])2422 self.updateOptionDict(description)24232424if not self.silent:2425 sys.stdout.write("\rImporting revision%s(%s%%)"% (change, cnt *100/len(changes)))2426 sys.stdout.flush()2427 cnt = cnt +124282429try:2430if self.detectBranches:2431 branches = self.splitFilesIntoBranches(description)2432for branch in branches.keys():2433## HACK --hwn2434 branchPrefix = self.depotPaths[0] + branch +"/"24352436 parent =""24372438 filesForCommit = branches[branch]24392440if self.verbose:2441print"branch is%s"% branch24422443 self.updatedBranches.add(branch)24442445if branch not in self.createdBranches:2446 self.createdBranches.add(branch)2447 parent = self.knownBranches[branch]2448if parent == branch:2449 parent =""2450else:2451 fullBranch = self.projectName + branch2452if fullBranch not in self.p4BranchesInGit:2453if not self.silent:2454print("\nImporting new branch%s"% fullBranch);2455if self.importNewBranch(branch, change -1):2456 parent =""2457 self.p4BranchesInGit.append(fullBranch)2458if not self.silent:2459print("\nResuming with change%s"% change);24602461if self.verbose:2462print"parent determined through known branches:%s"% parent24632464 branch = self.gitRefForBranch(branch)2465 parent = self.gitRefForBranch(parent)24662467if self.verbose:2468print"looking for initial parent for%s; current parent is%s"% (branch, parent)24692470iflen(parent) ==0and branch in self.initialParents:2471 parent = self.initialParents[branch]2472del self.initialParents[branch]24732474 blob =None2475iflen(parent) >0:2476 tempBranch = os.path.join(self.tempBranchLocation,"%d"% (change))2477if self.verbose:2478print"Creating temporary branch: "+ tempBranch2479 self.commit(description, filesForCommit, tempBranch, [branchPrefix])2480 self.tempBranches.append(tempBranch)2481 self.checkpoint()2482 blob = self.searchParent(parent, branch, tempBranch)2483if blob:2484 self.commit(description, filesForCommit, branch, [branchPrefix], blob)2485else:2486if self.verbose:2487print"Parent of%snot found. Committing into head of%s"% (branch, parent)2488 self.commit(description, filesForCommit, branch, [branchPrefix], parent)2489else:2490 files = self.extractFilesFromCommit(description)2491 self.commit(description, files, self.branch, self.depotPaths,2492 self.initialParent)2493 self.initialParent =""2494exceptIOError:2495print self.gitError.read()2496 sys.exit(1)24972498defimportHeadRevision(self, revision):2499print"Doing initial import of%sfrom revision%sinto%s"% (' '.join(self.depotPaths), revision, self.branch)25002501 details = {}2502 details["user"] ="git perforce import user"2503 details["desc"] = ("Initial import of%sfrom the state at revision%s\n"2504% (' '.join(self.depotPaths), revision))2505 details["change"] = revision2506 newestRevision =025072508 fileCnt =02509 fileArgs = ["%s...%s"% (p,revision)for p in self.depotPaths]25102511for info inp4CmdList(["files"] + fileArgs):25122513if'code'in info and info['code'] =='error':2514 sys.stderr.write("p4 returned an error:%s\n"2515% info['data'])2516if info['data'].find("must refer to client") >=0:2517 sys.stderr.write("This particular p4 error is misleading.\n")2518 sys.stderr.write("Perhaps the depot path was misspelled.\n");2519 sys.stderr.write("Depot path:%s\n"%" ".join(self.depotPaths))2520 sys.exit(1)2521if'p4ExitCode'in info:2522 sys.stderr.write("p4 exitcode:%s\n"% info['p4ExitCode'])2523 sys.exit(1)252425252526 change =int(info["change"])2527if change > newestRevision:2528 newestRevision = change25292530if info["action"]in self.delete_actions:2531# don't increase the file cnt, otherwise details["depotFile123"] will have gaps!2532#fileCnt = fileCnt + 12533continue25342535for prop in["depotFile","rev","action","type"]:2536 details["%s%s"% (prop, fileCnt)] = info[prop]25372538 fileCnt = fileCnt +125392540 details["change"] = newestRevision25412542# Use time from top-most change so that all git p4 clones of2543# the same p4 repo have the same commit SHA1s.2544 res =p4CmdList("describe -s%d"% newestRevision)2545 newestTime =None2546for r in res:2547if r.has_key('time'):2548 newestTime =int(r['time'])2549if newestTime is None:2550die("\"describe -s\"on newest change%ddid not give a time")2551 details["time"] = newestTime25522553 self.updateOptionDict(details)2554try:2555 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPaths)2556exceptIOError:2557print"IO error with git fast-import. Is your git version recent enough?"2558print self.gitError.read()255925602561defrun(self, args):2562 self.depotPaths = []2563 self.changeRange =""2564 self.initialParent =""2565 self.previousDepotPaths = []25662567# map from branch depot path to parent branch2568 self.knownBranches = {}2569 self.initialParents = {}2570 self.hasOrigin =originP4BranchesExist()2571if not self.syncWithOrigin:2572 self.hasOrigin =False25732574if self.importIntoRemotes:2575 self.refPrefix ="refs/remotes/p4/"2576else:2577 self.refPrefix ="refs/heads/p4/"25782579if self.syncWithOrigin and self.hasOrigin:2580if not self.silent:2581print"Syncing with origin first by calling git fetch origin"2582system("git fetch origin")25832584iflen(self.branch) ==0:2585 self.branch = self.refPrefix +"master"2586ifgitBranchExists("refs/heads/p4")and self.importIntoRemotes:2587system("git update-ref%srefs/heads/p4"% self.branch)2588system("git branch -D p4");2589# create it /after/ importing, when master exists2590if notgitBranchExists(self.refPrefix +"HEAD")and self.importIntoRemotes andgitBranchExists(self.branch):2591system("git symbolic-ref%sHEAD%s"% (self.refPrefix, self.branch))25922593# accept either the command-line option, or the configuration variable2594if self.useClientSpec:2595# will use this after clone to set the variable2596 self.useClientSpec_from_options =True2597else:2598ifgitConfig("git-p4.useclientspec","--bool") =="true":2599 self.useClientSpec =True2600if self.useClientSpec:2601 self.clientSpecDirs =getClientSpec()26022603# TODO: should always look at previous commits,2604# merge with previous imports, if possible.2605if args == []:2606if self.hasOrigin:2607createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)2608 self.listExistingP4GitBranches()26092610iflen(self.p4BranchesInGit) >1:2611if not self.silent:2612print"Importing from/into multiple branches"2613 self.detectBranches =True26142615if self.verbose:2616print"branches:%s"% self.p4BranchesInGit26172618 p4Change =02619for branch in self.p4BranchesInGit:2620 logMsg =extractLogMessageFromGitCommit(self.refPrefix + branch)26212622 settings =extractSettingsGitLog(logMsg)26232624 self.readOptions(settings)2625if(settings.has_key('depot-paths')2626and settings.has_key('change')):2627 change =int(settings['change']) +12628 p4Change =max(p4Change, change)26292630 depotPaths =sorted(settings['depot-paths'])2631if self.previousDepotPaths == []:2632 self.previousDepotPaths = depotPaths2633else:2634 paths = []2635for(prev, cur)inzip(self.previousDepotPaths, depotPaths):2636 prev_list = prev.split("/")2637 cur_list = cur.split("/")2638for i inrange(0,min(len(cur_list),len(prev_list))):2639if cur_list[i] <> prev_list[i]:2640 i = i -12641break26422643 paths.append("/".join(cur_list[:i +1]))26442645 self.previousDepotPaths = paths26462647if p4Change >0:2648 self.depotPaths =sorted(self.previousDepotPaths)2649 self.changeRange ="@%s,#head"% p4Change2650if not self.detectBranches:2651 self.initialParent =parseRevision(self.branch)2652if not self.silent and not self.detectBranches:2653print"Performing incremental import into%sgit branch"% self.branch26542655if not self.branch.startswith("refs/"):2656 self.branch ="refs/heads/"+ self.branch26572658iflen(args) ==0and self.depotPaths:2659if not self.silent:2660print"Depot paths:%s"%' '.join(self.depotPaths)2661else:2662if self.depotPaths and self.depotPaths != args:2663print("previous import used depot path%sand now%swas specified. "2664"This doesn't work!"% (' '.join(self.depotPaths),2665' '.join(args)))2666 sys.exit(1)26672668 self.depotPaths =sorted(args)26692670 revision =""2671 self.users = {}26722673# Make sure no revision specifiers are used when --changesfile2674# is specified.2675 bad_changesfile =False2676iflen(self.changesFile) >0:2677for p in self.depotPaths:2678if p.find("@") >=0or p.find("#") >=0:2679 bad_changesfile =True2680break2681if bad_changesfile:2682die("Option --changesfile is incompatible with revision specifiers")26832684 newPaths = []2685for p in self.depotPaths:2686if p.find("@") != -1:2687 atIdx = p.index("@")2688 self.changeRange = p[atIdx:]2689if self.changeRange =="@all":2690 self.changeRange =""2691elif','not in self.changeRange:2692 revision = self.changeRange2693 self.changeRange =""2694 p = p[:atIdx]2695elif p.find("#") != -1:2696 hashIdx = p.index("#")2697 revision = p[hashIdx:]2698 p = p[:hashIdx]2699elif self.previousDepotPaths == []:2700# pay attention to changesfile, if given, else import2701# the entire p4 tree at the head revision2702iflen(self.changesFile) ==0:2703 revision ="#head"27042705 p = re.sub("\.\.\.$","", p)2706if not p.endswith("/"):2707 p +="/"27082709 newPaths.append(p)27102711 self.depotPaths = newPaths27122713 self.loadUserMapFromCache()2714 self.labels = {}2715if self.detectLabels:2716 self.getLabels();27172718if self.detectBranches:2719## FIXME - what's a P4 projectName ?2720 self.projectName = self.guessProjectName()27212722if self.hasOrigin:2723 self.getBranchMappingFromGitBranches()2724else:2725 self.getBranchMapping()2726if self.verbose:2727print"p4-git branches:%s"% self.p4BranchesInGit2728print"initial parents:%s"% self.initialParents2729for b in self.p4BranchesInGit:2730if b !="master":27312732## FIXME2733 b = b[len(self.projectName):]2734 self.createdBranches.add(b)27352736 self.tz ="%+03d%02d"% (- time.timezone /3600, ((- time.timezone %3600) /60))27372738 importProcess = subprocess.Popen(["git","fast-import"],2739 stdin=subprocess.PIPE, stdout=subprocess.PIPE,2740 stderr=subprocess.PIPE);2741 self.gitOutput = importProcess.stdout2742 self.gitStream = importProcess.stdin2743 self.gitError = importProcess.stderr27442745if revision:2746 self.importHeadRevision(revision)2747else:2748 changes = []27492750iflen(self.changesFile) >0:2751 output =open(self.changesFile).readlines()2752 changeSet =set()2753for line in output:2754 changeSet.add(int(line))27552756for change in changeSet:2757 changes.append(change)27582759 changes.sort()2760else:2761# catch "git p4 sync" with no new branches, in a repo that2762# does not have any existing p4 branches2763iflen(args) ==0and not self.p4BranchesInGit:2764die("No remote p4 branches. Perhaps you never did\"git p4 clone\"in here.");2765if self.verbose:2766print"Getting p4 changes for%s...%s"% (', '.join(self.depotPaths),2767 self.changeRange)2768 changes =p4ChangesForPaths(self.depotPaths, self.changeRange)27692770iflen(self.maxChanges) >0:2771 changes = changes[:min(int(self.maxChanges),len(changes))]27722773iflen(changes) ==0:2774if not self.silent:2775print"No changes to import!"2776else:2777if not self.silent and not self.detectBranches:2778print"Import destination:%s"% self.branch27792780 self.updatedBranches =set()27812782 self.importChanges(changes)27832784if not self.silent:2785print""2786iflen(self.updatedBranches) >0:2787 sys.stdout.write("Updated branches: ")2788for b in self.updatedBranches:2789 sys.stdout.write("%s"% b)2790 sys.stdout.write("\n")27912792ifgitConfig("git-p4.importLabels","--bool") =="true":2793 self.importLabels =True27942795if self.importLabels:2796 p4Labels =getP4Labels(self.depotPaths)2797 gitTags =getGitTags()27982799 missingP4Labels = p4Labels - gitTags2800 self.importP4Labels(self.gitStream, missingP4Labels)28012802 self.gitStream.close()2803if importProcess.wait() !=0:2804die("fast-import failed:%s"% self.gitError.read())2805 self.gitOutput.close()2806 self.gitError.close()28072808# Cleanup temporary branches created during import2809if self.tempBranches != []:2810for branch in self.tempBranches:2811read_pipe("git update-ref -d%s"% branch)2812 os.rmdir(os.path.join(os.environ.get("GIT_DIR",".git"), self.tempBranchLocation))28132814return True28152816classP4Rebase(Command):2817def__init__(self):2818 Command.__init__(self)2819 self.options = [2820 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),2821]2822 self.importLabels =False2823 self.description = ("Fetches the latest revision from perforce and "2824+"rebases the current work (branch) against it")28252826defrun(self, args):2827 sync =P4Sync()2828 sync.importLabels = self.importLabels2829 sync.run([])28302831return self.rebase()28322833defrebase(self):2834if os.system("git update-index --refresh") !=0:2835die("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.");2836iflen(read_pipe("git diff-index HEAD --")) >0:2837die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash.");28382839[upstream, settings] =findUpstreamBranchPoint()2840iflen(upstream) ==0:2841die("Cannot find upstream branchpoint for rebase")28422843# the branchpoint may be p4/foo~3, so strip off the parent2844 upstream = re.sub("~[0-9]+$","", upstream)28452846print"Rebasing the current branch onto%s"% upstream2847 oldHead =read_pipe("git rev-parse HEAD").strip()2848system("git rebase%s"% upstream)2849system("git diff-tree --stat --summary -M%sHEAD"% oldHead)2850return True28512852classP4Clone(P4Sync):2853def__init__(self):2854 P4Sync.__init__(self)2855 self.description ="Creates a new git repository and imports from Perforce into it"2856 self.usage ="usage: %prog [options] //depot/path[@revRange]"2857 self.options += [2858 optparse.make_option("--destination", dest="cloneDestination",2859 action='store', default=None,2860help="where to leave result of the clone"),2861 optparse.make_option("-/", dest="cloneExclude",2862 action="append",type="string",2863help="exclude depot path"),2864 optparse.make_option("--bare", dest="cloneBare",2865 action="store_true", default=False),2866]2867 self.cloneDestination =None2868 self.needsGit =False2869 self.cloneBare =False28702871# This is required for the "append" cloneExclude action2872defensure_value(self, attr, value):2873if nothasattr(self, attr)orgetattr(self, attr)is None:2874setattr(self, attr, value)2875returngetattr(self, attr)28762877defdefaultDestination(self, args):2878## TODO: use common prefix of args?2879 depotPath = args[0]2880 depotDir = re.sub("(@[^@]*)$","", depotPath)2881 depotDir = re.sub("(#[^#]*)$","", depotDir)2882 depotDir = re.sub(r"\.\.\.$","", depotDir)2883 depotDir = re.sub(r"/$","", depotDir)2884return os.path.split(depotDir)[1]28852886defrun(self, args):2887iflen(args) <1:2888return False28892890if self.keepRepoPath and not self.cloneDestination:2891 sys.stderr.write("Must specify destination for --keep-path\n")2892 sys.exit(1)28932894 depotPaths = args28952896if not self.cloneDestination andlen(depotPaths) >1:2897 self.cloneDestination = depotPaths[-1]2898 depotPaths = depotPaths[:-1]28992900 self.cloneExclude = ["/"+p for p in self.cloneExclude]2901for p in depotPaths:2902if not p.startswith("//"):2903return False29042905if not self.cloneDestination:2906 self.cloneDestination = self.defaultDestination(args)29072908print"Importing from%sinto%s"% (', '.join(depotPaths), self.cloneDestination)29092910if not os.path.exists(self.cloneDestination):2911 os.makedirs(self.cloneDestination)2912chdir(self.cloneDestination)29132914 init_cmd = ["git","init"]2915if self.cloneBare:2916 init_cmd.append("--bare")2917 subprocess.check_call(init_cmd)29182919if not P4Sync.run(self, depotPaths):2920return False2921if self.branch !="master":2922if self.importIntoRemotes:2923 masterbranch ="refs/remotes/p4/master"2924else:2925 masterbranch ="refs/heads/p4/master"2926ifgitBranchExists(masterbranch):2927system("git branch master%s"% masterbranch)2928if not self.cloneBare:2929system("git checkout -f")2930else:2931print"Could not detect main branch. No checkout/master branch created."29322933# auto-set this variable if invoked with --use-client-spec2934if self.useClientSpec_from_options:2935system("git config --bool git-p4.useclientspec true")29362937return True29382939classP4Branches(Command):2940def__init__(self):2941 Command.__init__(self)2942 self.options = [ ]2943 self.description = ("Shows the git branches that hold imports and their "2944+"corresponding perforce depot paths")2945 self.verbose =False29462947defrun(self, args):2948iforiginP4BranchesExist():2949createOrUpdateBranchesFromOrigin()29502951 cmdline ="git rev-parse --symbolic "2952 cmdline +=" --remotes"29532954for line inread_pipe_lines(cmdline):2955 line = line.strip()29562957if not line.startswith('p4/')or line =="p4/HEAD":2958continue2959 branch = line29602961 log =extractLogMessageFromGitCommit("refs/remotes/%s"% branch)2962 settings =extractSettingsGitLog(log)29632964print"%s<=%s(%s)"% (branch,",".join(settings["depot-paths"]), settings["change"])2965return True29662967classHelpFormatter(optparse.IndentedHelpFormatter):2968def__init__(self):2969 optparse.IndentedHelpFormatter.__init__(self)29702971defformat_description(self, description):2972if description:2973return description +"\n"2974else:2975return""29762977defprintUsage(commands):2978print"usage:%s<command> [options]"% sys.argv[0]2979print""2980print"valid commands:%s"%", ".join(commands)2981print""2982print"Try%s<command> --help for command specific help."% sys.argv[0]2983print""29842985commands = {2986"debug": P4Debug,2987"submit": P4Submit,2988"commit": P4Submit,2989"sync": P4Sync,2990"rebase": P4Rebase,2991"clone": P4Clone,2992"rollback": P4RollBack,2993"branches": P4Branches2994}299529962997defmain():2998iflen(sys.argv[1:]) ==0:2999printUsage(commands.keys())3000 sys.exit(2)30013002 cmd =""3003 cmdName = sys.argv[1]3004try:3005 klass = commands[cmdName]3006 cmd =klass()3007exceptKeyError:3008print"unknown command%s"% cmdName3009print""3010printUsage(commands.keys())3011 sys.exit(2)30123013 options = cmd.options3014 cmd.gitdir = os.environ.get("GIT_DIR",None)30153016 args = sys.argv[2:]30173018 options.append(optparse.make_option("--verbose", dest="verbose", action="store_true"))3019if cmd.needsGit:3020 options.append(optparse.make_option("--git-dir", dest="gitdir"))30213022 parser = optparse.OptionParser(cmd.usage.replace("%prog","%prog "+ cmdName),3023 options,3024 description = cmd.description,3025 formatter =HelpFormatter())30263027(cmd, args) = parser.parse_args(sys.argv[2:], cmd);3028global verbose3029 verbose = cmd.verbose3030if cmd.needsGit:3031if cmd.gitdir ==None:3032 cmd.gitdir = os.path.abspath(".git")3033if notisValidGitDir(cmd.gitdir):3034 cmd.gitdir =read_pipe("git rev-parse --git-dir").strip()3035if os.path.exists(cmd.gitdir):3036 cdup =read_pipe("git rev-parse --show-cdup").strip()3037iflen(cdup) >0:3038chdir(cdup);30393040if notisValidGitDir(cmd.gitdir):3041ifisValidGitDir(cmd.gitdir +"/.git"):3042 cmd.gitdir +="/.git"3043else:3044die("fatal: cannot locate git repository at%s"% cmd.gitdir)30453046 os.environ["GIT_DIR"] = cmd.gitdir30473048if not cmd.run(args):3049 parser.print_help()3050 sys.exit(2)305130523053if __name__ =='__main__':3054main()