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 (:[^$\n]+)? # 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): 847 848 conflict_behavior_choices = ("ask","skip","quit") 849 850def__init__(self): 851 Command.__init__(self) 852 P4UserMap.__init__(self) 853 self.options = [ 854 optparse.make_option("--origin", dest="origin"), 855 optparse.make_option("-M", dest="detectRenames", action="store_true"), 856# preserve the user, requires relevant p4 permissions 857 optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"), 858 optparse.make_option("--export-labels", dest="exportLabels", action="store_true"), 859 optparse.make_option("--dry-run","-n", dest="dry_run", action="store_true"), 860 optparse.make_option("--prepare-p4-only", dest="prepare_p4_only", action="store_true"), 861 optparse.make_option("--conflict", dest="conflict_behavior", 862 choices=self.conflict_behavior_choices) 863] 864 self.description ="Submit changes from git to the perforce depot." 865 self.usage +=" [name of git branch to submit into perforce depot]" 866 self.origin ="" 867 self.detectRenames =False 868 self.preserveUser =gitConfig("git-p4.preserveUser").lower() =="true" 869 self.dry_run =False 870 self.prepare_p4_only =False 871 self.conflict_behavior =None 872 self.isWindows = (platform.system() =="Windows") 873 self.exportLabels =False 874 self.p4HasMoveCommand =p4_has_command("move") 875 876defcheck(self): 877iflen(p4CmdList("opened ...")) >0: 878die("You have files opened with perforce! Close them before starting the sync.") 879 880defseparate_jobs_from_description(self, message): 881"""Extract and return a possible Jobs field in the commit 882 message. It goes into a separate section in the p4 change 883 specification. 884 885 A jobs line starts with "Jobs:" and looks like a new field 886 in a form. Values are white-space separated on the same 887 line or on following lines that start with a tab. 888 889 This does not parse and extract the full git commit message 890 like a p4 form. It just sees the Jobs: line as a marker 891 to pass everything from then on directly into the p4 form, 892 but outside the description section. 893 894 Return a tuple (stripped log message, jobs string).""" 895 896 m = re.search(r'^Jobs:', message, re.MULTILINE) 897if m is None: 898return(message,None) 899 900 jobtext = message[m.start():] 901 stripped_message = message[:m.start()].rstrip() 902return(stripped_message, jobtext) 903 904defprepareLogMessage(self, template, message, jobs): 905"""Edits the template returned from "p4 change -o" to insert 906 the message in the Description field, and the jobs text in 907 the Jobs field.""" 908 result ="" 909 910 inDescriptionSection =False 911 912for line in template.split("\n"): 913if line.startswith("#"): 914 result += line +"\n" 915continue 916 917if inDescriptionSection: 918if line.startswith("Files:")or line.startswith("Jobs:"): 919 inDescriptionSection =False 920# insert Jobs section 921if jobs: 922 result += jobs +"\n" 923else: 924continue 925else: 926if line.startswith("Description:"): 927 inDescriptionSection =True 928 line +="\n" 929for messageLine in message.split("\n"): 930 line +="\t"+ messageLine +"\n" 931 932 result += line +"\n" 933 934return result 935 936defpatchRCSKeywords(self,file, pattern): 937# Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern 938(handle, outFileName) = tempfile.mkstemp(dir='.') 939try: 940 outFile = os.fdopen(handle,"w+") 941 inFile =open(file,"r") 942 regexp = re.compile(pattern, re.VERBOSE) 943for line in inFile.readlines(): 944 line = regexp.sub(r'$\1$', line) 945 outFile.write(line) 946 inFile.close() 947 outFile.close() 948# Forcibly overwrite the original file 949 os.unlink(file) 950 shutil.move(outFileName,file) 951except: 952# cleanup our temporary file 953 os.unlink(outFileName) 954print"Failed to strip RCS keywords in%s"%file 955raise 956 957print"Patched up RCS keywords in%s"%file 958 959defp4UserForCommit(self,id): 960# Return the tuple (perforce user,git email) for a given git commit id 961 self.getUserMapFromPerforceServer() 962 gitEmail =read_pipe("git log --max-count=1 --format='%%ae'%s"%id) 963 gitEmail = gitEmail.strip() 964if not self.emails.has_key(gitEmail): 965return(None,gitEmail) 966else: 967return(self.emails[gitEmail],gitEmail) 968 969defcheckValidP4Users(self,commits): 970# check if any git authors cannot be mapped to p4 users 971foridin commits: 972(user,email) = self.p4UserForCommit(id) 973if not user: 974 msg ="Cannot find p4 user for email%sin commit%s."% (email,id) 975ifgitConfig('git-p4.allowMissingP4Users').lower() =="true": 976print"%s"% msg 977else: 978die("Error:%s\nSet git-p4.allowMissingP4Users to true to allow this."% msg) 979 980deflastP4Changelist(self): 981# Get back the last changelist number submitted in this client spec. This 982# then gets used to patch up the username in the change. If the same 983# client spec is being used by multiple processes then this might go 984# wrong. 985 results =p4CmdList("client -o")# find the current client 986 client =None 987for r in results: 988if r.has_key('Client'): 989 client = r['Client'] 990break 991if not client: 992die("could not get client spec") 993 results =p4CmdList(["changes","-c", client,"-m","1"]) 994for r in results: 995if r.has_key('change'): 996return r['change'] 997die("Could not get changelist number for last submit - cannot patch up user details") 998 999defmodifyChangelistUser(self, changelist, newUser):1000# fixup the user field of a changelist after it has been submitted.1001 changes =p4CmdList("change -o%s"% changelist)1002iflen(changes) !=1:1003die("Bad output from p4 change modifying%sto user%s"%1004(changelist, newUser))10051006 c = changes[0]1007if c['User'] == newUser:return# nothing to do1008 c['User'] = newUser1009input= marshal.dumps(c)10101011 result =p4CmdList("change -f -i", stdin=input)1012for r in result:1013if r.has_key('code'):1014if r['code'] =='error':1015die("Could not modify user field of changelist%sto%s:%s"% (changelist, newUser, r['data']))1016if r.has_key('data'):1017print("Updated user field for changelist%sto%s"% (changelist, newUser))1018return1019die("Could not modify user field of changelist%sto%s"% (changelist, newUser))10201021defcanChangeChangelists(self):1022# check to see if we have p4 admin or super-user permissions, either of1023# which are required to modify changelists.1024 results =p4CmdList(["protects", self.depotPath])1025for r in results:1026if r.has_key('perm'):1027if r['perm'] =='admin':1028return11029if r['perm'] =='super':1030return11031return010321033defprepareSubmitTemplate(self):1034"""Run "p4 change -o" to grab a change specification template.1035 This does not use "p4 -G", as it is nice to keep the submission1036 template in original order, since a human might edit it.10371038 Remove lines in the Files section that show changes to files1039 outside the depot path we're committing into."""10401041 template =""1042 inFilesSection =False1043for line inp4_read_pipe_lines(['change','-o']):1044if line.endswith("\r\n"):1045 line = line[:-2] +"\n"1046if inFilesSection:1047if line.startswith("\t"):1048# path starts and ends with a tab1049 path = line[1:]1050 lastTab = path.rfind("\t")1051if lastTab != -1:1052 path = path[:lastTab]1053if notp4PathStartsWith(path, self.depotPath):1054continue1055else:1056 inFilesSection =False1057else:1058if line.startswith("Files:"):1059 inFilesSection =True10601061 template += line10621063return template10641065defedit_template(self, template_file):1066"""Invoke the editor to let the user change the submission1067 message. Return true if okay to continue with the submit."""10681069# if configured to skip the editing part, just submit1070ifgitConfig("git-p4.skipSubmitEdit") =="true":1071return True10721073# look at the modification time, to check later if the user saved1074# the file1075 mtime = os.stat(template_file).st_mtime10761077# invoke the editor1078if os.environ.has_key("P4EDITOR")and(os.environ.get("P4EDITOR") !=""):1079 editor = os.environ.get("P4EDITOR")1080else:1081 editor =read_pipe("git var GIT_EDITOR").strip()1082system(editor +" "+ template_file)10831084# If the file was not saved, prompt to see if this patch should1085# be skipped. But skip this verification step if configured so.1086ifgitConfig("git-p4.skipSubmitEditCheck") =="true":1087return True10881089# modification time updated means user saved the file1090if os.stat(template_file).st_mtime > mtime:1091return True10921093while True:1094 response =raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")1095if response =='y':1096return True1097if response =='n':1098return False10991100defapplyCommit(self,id):1101"""Apply one commit, return True if it succeeded."""11021103print"Applying",read_pipe(["git","show","-s",1104"--format=format:%h%s",id])11051106(p4User, gitEmail) = self.p4UserForCommit(id)11071108 diff =read_pipe_lines("git diff-tree -r%s\"%s^\" \"%s\""% (self.diffOpts,id,id))1109 filesToAdd =set()1110 filesToDelete =set()1111 editedFiles =set()1112 pureRenameCopy =set()1113 filesToChangeExecBit = {}11141115for line in diff:1116 diff =parseDiffTreeEntry(line)1117 modifier = diff['status']1118 path = diff['src']1119if modifier =="M":1120p4_edit(path)1121ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1122 filesToChangeExecBit[path] = diff['dst_mode']1123 editedFiles.add(path)1124elif modifier =="A":1125 filesToAdd.add(path)1126 filesToChangeExecBit[path] = diff['dst_mode']1127if path in filesToDelete:1128 filesToDelete.remove(path)1129elif modifier =="D":1130 filesToDelete.add(path)1131if path in filesToAdd:1132 filesToAdd.remove(path)1133elif modifier =="C":1134 src, dest = diff['src'], diff['dst']1135p4_integrate(src, dest)1136 pureRenameCopy.add(dest)1137if diff['src_sha1'] != diff['dst_sha1']:1138p4_edit(dest)1139 pureRenameCopy.discard(dest)1140ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1141p4_edit(dest)1142 pureRenameCopy.discard(dest)1143 filesToChangeExecBit[dest] = diff['dst_mode']1144 os.unlink(dest)1145 editedFiles.add(dest)1146elif modifier =="R":1147 src, dest = diff['src'], diff['dst']1148if self.p4HasMoveCommand:1149p4_edit(src)# src must be open before move1150p4_move(src, dest)# opens for (move/delete, move/add)1151else:1152p4_integrate(src, dest)1153if diff['src_sha1'] != diff['dst_sha1']:1154p4_edit(dest)1155else:1156 pureRenameCopy.add(dest)1157ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1158if not self.p4HasMoveCommand:1159p4_edit(dest)# with move: already open, writable1160 filesToChangeExecBit[dest] = diff['dst_mode']1161if not self.p4HasMoveCommand:1162 os.unlink(dest)1163 filesToDelete.add(src)1164 editedFiles.add(dest)1165else:1166die("unknown modifier%sfor%s"% (modifier, path))11671168 diffcmd ="git format-patch -k --stdout\"%s^\"..\"%s\""% (id,id)1169 patchcmd = diffcmd +" | git apply "1170 tryPatchCmd = patchcmd +"--check -"1171 applyPatchCmd = patchcmd +"--check --apply -"1172 patch_succeeded =True11731174if os.system(tryPatchCmd) !=0:1175 fixed_rcs_keywords =False1176 patch_succeeded =False1177print"Unfortunately applying the change failed!"11781179# Patch failed, maybe it's just RCS keyword woes. Look through1180# the patch to see if that's possible.1181ifgitConfig("git-p4.attemptRCSCleanup","--bool") =="true":1182file=None1183 pattern =None1184 kwfiles = {}1185forfilein editedFiles | filesToDelete:1186# did this file's delta contain RCS keywords?1187 pattern =p4_keywords_regexp_for_file(file)11881189if pattern:1190# this file is a possibility...look for RCS keywords.1191 regexp = re.compile(pattern, re.VERBOSE)1192for line inread_pipe_lines(["git","diff","%s^..%s"% (id,id),file]):1193if regexp.search(line):1194if verbose:1195print"got keyword match on%sin%sin%s"% (pattern, line,file)1196 kwfiles[file] = pattern1197break11981199forfilein kwfiles:1200if verbose:1201print"zapping%swith%s"% (line,pattern)1202 self.patchRCSKeywords(file, kwfiles[file])1203 fixed_rcs_keywords =True12041205if fixed_rcs_keywords:1206print"Retrying the patch with RCS keywords cleaned up"1207if os.system(tryPatchCmd) ==0:1208 patch_succeeded =True12091210if not patch_succeeded:1211for f in editedFiles:1212p4_revert(f)1213return False12141215#1216# Apply the patch for real, and do add/delete/+x handling.1217#1218system(applyPatchCmd)12191220for f in filesToAdd:1221p4_add(f)1222for f in filesToDelete:1223p4_revert(f)1224p4_delete(f)12251226# Set/clear executable bits1227for f in filesToChangeExecBit.keys():1228 mode = filesToChangeExecBit[f]1229setP4ExecBit(f, mode)12301231#1232# Build p4 change description, starting with the contents1233# of the git commit message.1234#1235 logMessage =extractLogMessageFromGitCommit(id)1236 logMessage = logMessage.strip()1237(logMessage, jobs) = self.separate_jobs_from_description(logMessage)12381239 template = self.prepareSubmitTemplate()1240 submitTemplate = self.prepareLogMessage(template, logMessage, jobs)12411242if self.preserveUser:1243 submitTemplate +="\n######## Actual user%s, modified after commit\n"% p4User12441245if self.checkAuthorship and not self.p4UserIsMe(p4User):1246 submitTemplate +="######## git author%sdoes not match your p4 account.\n"% gitEmail1247 submitTemplate +="######## Use option --preserve-user to modify authorship.\n"1248 submitTemplate +="######## Variable git-p4.skipUserNameCheck hides this message.\n"12491250 separatorLine ="######## everything below this line is just the diff #######\n"12511252# diff1253if os.environ.has_key("P4DIFF"):1254del(os.environ["P4DIFF"])1255 diff =""1256for editedFile in editedFiles:1257 diff +=p4_read_pipe(['diff','-du',1258wildcard_encode(editedFile)])12591260# new file diff1261 newdiff =""1262for newFile in filesToAdd:1263 newdiff +="==== new file ====\n"1264 newdiff +="--- /dev/null\n"1265 newdiff +="+++%s\n"% newFile1266 f =open(newFile,"r")1267for line in f.readlines():1268 newdiff +="+"+ line1269 f.close()12701271# change description file: submitTemplate, separatorLine, diff, newdiff1272(handle, fileName) = tempfile.mkstemp()1273 tmpFile = os.fdopen(handle,"w+")1274if self.isWindows:1275 submitTemplate = submitTemplate.replace("\n","\r\n")1276 separatorLine = separatorLine.replace("\n","\r\n")1277 newdiff = newdiff.replace("\n","\r\n")1278 tmpFile.write(submitTemplate + separatorLine + diff + newdiff)1279 tmpFile.close()12801281if self.prepare_p4_only:1282#1283# Leave the p4 tree prepared, and the submit template around1284# and let the user decide what to do next1285#1286print1287print"P4 workspace prepared for submission."1288print"To submit or revert, go to client workspace"1289print" "+ self.clientPath1290print1291print"To submit, use\"p4 submit\"to write a new description,"1292print"or\"p4 submit -i%s\"to use the one prepared by" \1293"\"git p4\"."% fileName1294print"You can delete the file\"%s\"when finished."% fileName12951296if self.preserveUser and p4User and not self.p4UserIsMe(p4User):1297print"To preserve change ownership by user%s, you must\n" \1298"do\"p4 change -f <change>\"after submitting and\n" \1299"edit the User field."1300if pureRenameCopy:1301print"After submitting, renamed files must be re-synced."1302print"Invoke\"p4 sync -f\"on each of these files:"1303for f in pureRenameCopy:1304print" "+ f13051306print1307print"To revert the changes, use\"p4 revert ...\", and delete"1308print"the submit template file\"%s\""% fileName1309if filesToAdd:1310print"Since the commit adds new files, they must be deleted:"1311for f in filesToAdd:1312print" "+ f1313print1314return True13151316#1317# Let the user edit the change description, then submit it.1318#1319if self.edit_template(fileName):1320# read the edited message and submit1321 ret =True1322 tmpFile =open(fileName,"rb")1323 message = tmpFile.read()1324 tmpFile.close()1325 submitTemplate = message[:message.index(separatorLine)]1326if self.isWindows:1327 submitTemplate = submitTemplate.replace("\r\n","\n")1328p4_write_pipe(['submit','-i'], submitTemplate)13291330if self.preserveUser:1331if p4User:1332# Get last changelist number. Cannot easily get it from1333# the submit command output as the output is1334# unmarshalled.1335 changelist = self.lastP4Changelist()1336 self.modifyChangelistUser(changelist, p4User)13371338# The rename/copy happened by applying a patch that created a1339# new file. This leaves it writable, which confuses p4.1340for f in pureRenameCopy:1341p4_sync(f,"-f")13421343else:1344# skip this patch1345 ret =False1346print"Submission cancelled, undoing p4 changes."1347for f in editedFiles:1348p4_revert(f)1349for f in filesToAdd:1350p4_revert(f)1351 os.remove(f)1352for f in filesToDelete:1353p4_revert(f)13541355 os.remove(fileName)1356return ret13571358# Export git tags as p4 labels. Create a p4 label and then tag1359# with that.1360defexportGitTags(self, gitTags):1361 validLabelRegexp =gitConfig("git-p4.labelExportRegexp")1362iflen(validLabelRegexp) ==0:1363 validLabelRegexp = defaultLabelRegexp1364 m = re.compile(validLabelRegexp)13651366for name in gitTags:13671368if not m.match(name):1369if verbose:1370print"tag%sdoes not match regexp%s"% (name, validLabelRegexp)1371continue13721373# Get the p4 commit this corresponds to1374 logMessage =extractLogMessageFromGitCommit(name)1375 values =extractSettingsGitLog(logMessage)13761377if not values.has_key('change'):1378# a tag pointing to something not sent to p4; ignore1379if verbose:1380print"git tag%sdoes not give a p4 commit"% name1381continue1382else:1383 changelist = values['change']13841385# Get the tag details.1386 inHeader =True1387 isAnnotated =False1388 body = []1389for l inread_pipe_lines(["git","cat-file","-p", name]):1390 l = l.strip()1391if inHeader:1392if re.match(r'tag\s+', l):1393 isAnnotated =True1394elif re.match(r'\s*$', l):1395 inHeader =False1396continue1397else:1398 body.append(l)13991400if not isAnnotated:1401 body = ["lightweight tag imported by git p4\n"]14021403# Create the label - use the same view as the client spec we are using1404 clientSpec =getClientSpec()14051406 labelTemplate ="Label:%s\n"% name1407 labelTemplate +="Description:\n"1408for b in body:1409 labelTemplate +="\t"+ b +"\n"1410 labelTemplate +="View:\n"1411for mapping in clientSpec.mappings:1412 labelTemplate +="\t%s\n"% mapping.depot_side.path14131414if self.dry_run:1415print"Would create p4 label%sfor tag"% name1416elif self.prepare_p4_only:1417print"Not creating p4 label%sfor tag due to option" \1418" --prepare-p4-only"% name1419else:1420p4_write_pipe(["label","-i"], labelTemplate)14211422# Use the label1423p4_system(["tag","-l", name] +1424["%s@%s"% (mapping.depot_side.path, changelist)for mapping in clientSpec.mappings])14251426if verbose:1427print"created p4 label for tag%s"% name14281429defrun(self, args):1430iflen(args) ==0:1431 self.master =currentGitBranch()1432iflen(self.master) ==0or notgitBranchExists("refs/heads/%s"% self.master):1433die("Detecting current git branch failed!")1434eliflen(args) ==1:1435 self.master = args[0]1436if notbranchExists(self.master):1437die("Branch%sdoes not exist"% self.master)1438else:1439return False14401441 allowSubmit =gitConfig("git-p4.allowSubmit")1442iflen(allowSubmit) >0and not self.master in allowSubmit.split(","):1443die("%sis not in git-p4.allowSubmit"% self.master)14441445[upstream, settings] =findUpstreamBranchPoint()1446 self.depotPath = settings['depot-paths'][0]1447iflen(self.origin) ==0:1448 self.origin = upstream14491450if self.preserveUser:1451if not self.canChangeChangelists():1452die("Cannot preserve user names without p4 super-user or admin permissions")14531454# if not set from the command line, try the config file1455if self.conflict_behavior is None:1456 val =gitConfig("git-p4.conflict")1457if val:1458if val not in self.conflict_behavior_choices:1459die("Invalid value '%s' for config git-p4.conflict"% val)1460else:1461 val ="ask"1462 self.conflict_behavior = val14631464if self.verbose:1465print"Origin branch is "+ self.origin14661467iflen(self.depotPath) ==0:1468print"Internal error: cannot locate perforce depot path from existing branches"1469 sys.exit(128)14701471 self.useClientSpec =False1472ifgitConfig("git-p4.useclientspec","--bool") =="true":1473 self.useClientSpec =True1474if self.useClientSpec:1475 self.clientSpecDirs =getClientSpec()14761477if self.useClientSpec:1478# all files are relative to the client spec1479 self.clientPath =getClientRoot()1480else:1481 self.clientPath =p4Where(self.depotPath)14821483if self.clientPath =="":1484die("Error: Cannot locate perforce checkout of%sin client view"% self.depotPath)14851486print"Perforce checkout for depot path%slocated at%s"% (self.depotPath, self.clientPath)1487 self.oldWorkingDirectory = os.getcwd()14881489# ensure the clientPath exists1490 new_client_dir =False1491if not os.path.exists(self.clientPath):1492 new_client_dir =True1493 os.makedirs(self.clientPath)14941495chdir(self.clientPath)1496if self.dry_run:1497print"Would synchronize p4 checkout in%s"% self.clientPath1498else:1499print"Synchronizing p4 checkout..."1500if new_client_dir:1501# old one was destroyed, and maybe nobody told p41502p4_sync("...","-f")1503else:1504p4_sync("...")1505 self.check()15061507 commits = []1508for line inread_pipe_lines("git rev-list --no-merges%s..%s"% (self.origin, self.master)):1509 commits.append(line.strip())1510 commits.reverse()15111512if self.preserveUser or(gitConfig("git-p4.skipUserNameCheck") =="true"):1513 self.checkAuthorship =False1514else:1515 self.checkAuthorship =True15161517if self.preserveUser:1518 self.checkValidP4Users(commits)15191520#1521# Build up a set of options to be passed to diff when1522# submitting each commit to p4.1523#1524if self.detectRenames:1525# command-line -M arg1526 self.diffOpts ="-M"1527else:1528# If not explicitly set check the config variable1529 detectRenames =gitConfig("git-p4.detectRenames")15301531if detectRenames.lower() =="false"or detectRenames =="":1532 self.diffOpts =""1533elif detectRenames.lower() =="true":1534 self.diffOpts ="-M"1535else:1536 self.diffOpts ="-M%s"% detectRenames15371538# no command-line arg for -C or --find-copies-harder, just1539# config variables1540 detectCopies =gitConfig("git-p4.detectCopies")1541if detectCopies.lower() =="false"or detectCopies =="":1542pass1543elif detectCopies.lower() =="true":1544 self.diffOpts +=" -C"1545else:1546 self.diffOpts +=" -C%s"% detectCopies15471548ifgitConfig("git-p4.detectCopiesHarder","--bool") =="true":1549 self.diffOpts +=" --find-copies-harder"15501551#1552# Apply the commits, one at a time. On failure, ask if should1553# continue to try the rest of the patches, or quit.1554#1555if self.dry_run:1556print"Would apply"1557 applied = []1558 last =len(commits) -11559for i, commit inenumerate(commits):1560if self.dry_run:1561print" ",read_pipe(["git","show","-s",1562"--format=format:%h%s", commit])1563 ok =True1564else:1565 ok = self.applyCommit(commit)1566if ok:1567 applied.append(commit)1568else:1569if self.prepare_p4_only and i < last:1570print"Processing only the first commit due to option" \1571" --prepare-p4-only"1572break1573if i < last:1574 quit =False1575while True:1576# prompt for what to do, or use the option/variable1577if self.conflict_behavior =="ask":1578print"What do you want to do?"1579 response =raw_input("[s]kip this commit but apply"1580" the rest, or [q]uit? ")1581if not response:1582continue1583elif self.conflict_behavior =="skip":1584 response ="s"1585elif self.conflict_behavior =="quit":1586 response ="q"1587else:1588die("Unknown conflict_behavior '%s'"%1589 self.conflict_behavior)15901591if response[0] =="s":1592print"Skipping this commit, but applying the rest"1593break1594if response[0] =="q":1595print"Quitting"1596 quit =True1597break1598if quit:1599break16001601chdir(self.oldWorkingDirectory)16021603if self.dry_run:1604pass1605elif self.prepare_p4_only:1606pass1607eliflen(commits) ==len(applied):1608print"All commits applied!"16091610 sync =P4Sync()1611 sync.run([])16121613 rebase =P4Rebase()1614 rebase.rebase()16151616else:1617iflen(applied) ==0:1618print"No commits applied."1619else:1620print"Applied only the commits marked with '*':"1621for c in commits:1622if c in applied:1623 star ="*"1624else:1625 star =" "1626print star,read_pipe(["git","show","-s",1627"--format=format:%h%s", c])1628print"You will have to do 'git p4 sync' and rebase."16291630ifgitConfig("git-p4.exportLabels","--bool") =="true":1631 self.exportLabels =True16321633if self.exportLabels:1634 p4Labels =getP4Labels(self.depotPath)1635 gitTags =getGitTags()16361637 missingGitTags = gitTags - p4Labels1638 self.exportGitTags(missingGitTags)16391640# exit with error unless everything applied perfecly1641iflen(commits) !=len(applied):1642 sys.exit(1)16431644return True16451646classView(object):1647"""Represent a p4 view ("p4 help views"), and map files in a1648 repo according to the view."""16491650classPath(object):1651"""A depot or client path, possibly containing wildcards.1652 The only one supported is ... at the end, currently.1653 Initialize with the full path, with //depot or //client."""16541655def__init__(self, path, is_depot):1656 self.path = path1657 self.is_depot = is_depot1658 self.find_wildcards()1659# remember the prefix bit, useful for relative mappings1660 m = re.match("(//[^/]+/)", self.path)1661if not m:1662die("Path%sdoes not start with //prefix/"% self.path)1663 prefix = m.group(1)1664if not self.is_depot:1665# strip //client/ on client paths1666 self.path = self.path[len(prefix):]16671668deffind_wildcards(self):1669"""Make sure wildcards are valid, and set up internal1670 variables."""16711672 self.ends_triple_dot =False1673# There are three wildcards allowed in p4 views1674# (see "p4 help views"). This code knows how to1675# handle "..." (only at the end), but cannot deal with1676# "%%n" or "*". Only check the depot_side, as p4 should1677# validate that the client_side matches too.1678if re.search(r'%%[1-9]', self.path):1679die("Can't handle%%n wildcards in view:%s"% self.path)1680if self.path.find("*") >=0:1681die("Can't handle * wildcards in view:%s"% self.path)1682 triple_dot_index = self.path.find("...")1683if triple_dot_index >=0:1684if triple_dot_index !=len(self.path) -3:1685die("Can handle only single ... wildcard, at end:%s"%1686 self.path)1687 self.ends_triple_dot =True16881689defensure_compatible(self, other_path):1690"""Make sure the wildcards agree."""1691if self.ends_triple_dot != other_path.ends_triple_dot:1692die("Both paths must end with ... if either does;\n"+1693"paths:%s %s"% (self.path, other_path.path))16941695defmatch_wildcards(self, test_path):1696"""See if this test_path matches us, and fill in the value1697 of the wildcards if so. Returns a tuple of1698 (True|False, wildcards[]). For now, only the ... at end1699 is supported, so at most one wildcard."""1700if self.ends_triple_dot:1701 dotless = self.path[:-3]1702if test_path.startswith(dotless):1703 wildcard = test_path[len(dotless):]1704return(True, [ wildcard ])1705else:1706if test_path == self.path:1707return(True, [])1708return(False, [])17091710defmatch(self, test_path):1711"""Just return if it matches; don't bother with the wildcards."""1712 b, _ = self.match_wildcards(test_path)1713return b17141715deffill_in_wildcards(self, wildcards):1716"""Return the relative path, with the wildcards filled in1717 if there are any."""1718if self.ends_triple_dot:1719return self.path[:-3] + wildcards[0]1720else:1721return self.path17221723classMapping(object):1724def__init__(self, depot_side, client_side, overlay, exclude):1725# depot_side is without the trailing /... if it had one1726 self.depot_side = View.Path(depot_side, is_depot=True)1727 self.client_side = View.Path(client_side, is_depot=False)1728 self.overlay = overlay # started with "+"1729 self.exclude = exclude # started with "-"1730assert not(self.overlay and self.exclude)1731 self.depot_side.ensure_compatible(self.client_side)17321733def__str__(self):1734 c =" "1735if self.overlay:1736 c ="+"1737if self.exclude:1738 c ="-"1739return"View.Mapping:%s%s->%s"% \1740(c, self.depot_side.path, self.client_side.path)17411742defmap_depot_to_client(self, depot_path):1743"""Calculate the client path if using this mapping on the1744 given depot path; does not consider the effect of other1745 mappings in a view. Even excluded mappings are returned."""1746 matches, wildcards = self.depot_side.match_wildcards(depot_path)1747if not matches:1748return""1749 client_path = self.client_side.fill_in_wildcards(wildcards)1750return client_path17511752#1753# View methods1754#1755def__init__(self):1756 self.mappings = []17571758defappend(self, view_line):1759"""Parse a view line, splitting it into depot and client1760 sides. Append to self.mappings, preserving order."""17611762# Split the view line into exactly two words. P4 enforces1763# structure on these lines that simplifies this quite a bit.1764#1765# Either or both words may be double-quoted.1766# Single quotes do not matter.1767# Double-quote marks cannot occur inside the words.1768# A + or - prefix is also inside the quotes.1769# There are no quotes unless they contain a space.1770# The line is already white-space stripped.1771# The two words are separated by a single space.1772#1773if view_line[0] =='"':1774# First word is double quoted. Find its end.1775 close_quote_index = view_line.find('"',1)1776if close_quote_index <=0:1777die("No first-word closing quote found:%s"% view_line)1778 depot_side = view_line[1:close_quote_index]1779# skip closing quote and space1780 rhs_index = close_quote_index +1+11781else:1782 space_index = view_line.find(" ")1783if space_index <=0:1784die("No word-splitting space found:%s"% view_line)1785 depot_side = view_line[0:space_index]1786 rhs_index = space_index +117871788if view_line[rhs_index] =='"':1789# Second word is double quoted. Make sure there is a1790# double quote at the end too.1791if not view_line.endswith('"'):1792die("View line with rhs quote should end with one:%s"%1793 view_line)1794# skip the quotes1795 client_side = view_line[rhs_index+1:-1]1796else:1797 client_side = view_line[rhs_index:]17981799# prefix + means overlay on previous mapping1800 overlay =False1801if depot_side.startswith("+"):1802 overlay =True1803 depot_side = depot_side[1:]18041805# prefix - means exclude this path1806 exclude =False1807if depot_side.startswith("-"):1808 exclude =True1809 depot_side = depot_side[1:]18101811 m = View.Mapping(depot_side, client_side, overlay, exclude)1812 self.mappings.append(m)18131814defmap_in_client(self, depot_path):1815"""Return the relative location in the client where this1816 depot file should live. Returns "" if the file should1817 not be mapped in the client."""18181819 paths_filled = []1820 client_path =""18211822# look at later entries first1823for m in self.mappings[::-1]:18241825# see where will this path end up in the client1826 p = m.map_depot_to_client(depot_path)18271828if p =="":1829# Depot path does not belong in client. Must remember1830# this, as previous items should not cause files to1831# exist in this path either. Remember that the list is1832# being walked from the end, which has higher precedence.1833# Overlap mappings do not exclude previous mappings.1834if not m.overlay:1835 paths_filled.append(m.client_side)18361837else:1838# This mapping matched; no need to search any further.1839# But, the mapping could be rejected if the client path1840# has already been claimed by an earlier mapping (i.e.1841# one later in the list, which we are walking backwards).1842 already_mapped_in_client =False1843for f in paths_filled:1844# this is View.Path.match1845if f.match(p):1846 already_mapped_in_client =True1847break1848if not already_mapped_in_client:1849# Include this file, unless it is from a line that1850# explicitly said to exclude it.1851if not m.exclude:1852 client_path = p18531854# a match, even if rejected, always stops the search1855break18561857return client_path18581859classP4Sync(Command, P4UserMap):1860 delete_actions = ("delete","move/delete","purge")18611862def__init__(self):1863 Command.__init__(self)1864 P4UserMap.__init__(self)1865 self.options = [1866 optparse.make_option("--branch", dest="branch"),1867 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),1868 optparse.make_option("--changesfile", dest="changesFile"),1869 optparse.make_option("--silent", dest="silent", action="store_true"),1870 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),1871 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),1872 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",1873help="Import into refs/heads/ , not refs/remotes"),1874 optparse.make_option("--max-changes", dest="maxChanges"),1875 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',1876help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),1877 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',1878help="Only sync files that are included in the Perforce Client Spec")1879]1880 self.description ="""Imports from Perforce into a git repository.\n1881 example:1882 //depot/my/project/ -- to import the current head1883 //depot/my/project/@all -- to import everything1884 //depot/my/project/@1,6 -- to import only from revision 1 to 618851886 (a ... is not needed in the path p4 specification, it's added implicitly)"""18871888 self.usage +=" //depot/path[@revRange]"1889 self.silent =False1890 self.createdBranches =set()1891 self.committedChanges =set()1892 self.branch =""1893 self.detectBranches =False1894 self.detectLabels =False1895 self.importLabels =False1896 self.changesFile =""1897 self.syncWithOrigin =True1898 self.importIntoRemotes =True1899 self.maxChanges =""1900 self.isWindows = (platform.system() =="Windows")1901 self.keepRepoPath =False1902 self.depotPaths =None1903 self.p4BranchesInGit = []1904 self.cloneExclude = []1905 self.useClientSpec =False1906 self.useClientSpec_from_options =False1907 self.clientSpecDirs =None1908 self.tempBranches = []1909 self.tempBranchLocation ="git-p4-tmp"19101911ifgitConfig("git-p4.syncFromOrigin") =="false":1912 self.syncWithOrigin =False19131914# Force a checkpoint in fast-import and wait for it to finish1915defcheckpoint(self):1916 self.gitStream.write("checkpoint\n\n")1917 self.gitStream.write("progress checkpoint\n\n")1918 out = self.gitOutput.readline()1919if self.verbose:1920print"checkpoint finished: "+ out19211922defextractFilesFromCommit(self, commit):1923 self.cloneExclude = [re.sub(r"\.\.\.$","", path)1924for path in self.cloneExclude]1925 files = []1926 fnum =01927while commit.has_key("depotFile%s"% fnum):1928 path = commit["depotFile%s"% fnum]19291930if[p for p in self.cloneExclude1931ifp4PathStartsWith(path, p)]:1932 found =False1933else:1934 found = [p for p in self.depotPaths1935ifp4PathStartsWith(path, p)]1936if not found:1937 fnum = fnum +11938continue19391940file= {}1941file["path"] = path1942file["rev"] = commit["rev%s"% fnum]1943file["action"] = commit["action%s"% fnum]1944file["type"] = commit["type%s"% fnum]1945 files.append(file)1946 fnum = fnum +11947return files19481949defstripRepoPath(self, path, prefixes):1950"""When streaming files, this is called to map a p4 depot path1951 to where it should go in git. The prefixes are either1952 self.depotPaths, or self.branchPrefixes in the case of1953 branch detection."""19541955if self.useClientSpec:1956# branch detection moves files up a level (the branch name)1957# from what client spec interpretation gives1958 path = self.clientSpecDirs.map_in_client(path)1959if self.detectBranches:1960for b in self.knownBranches:1961if path.startswith(b +"/"):1962 path = path[len(b)+1:]19631964elif self.keepRepoPath:1965# Preserve everything in relative path name except leading1966# //depot/; just look at first prefix as they all should1967# be in the same depot.1968 depot = re.sub("^(//[^/]+/).*", r'\1', prefixes[0])1969ifp4PathStartsWith(path, depot):1970 path = path[len(depot):]19711972else:1973for p in prefixes:1974ifp4PathStartsWith(path, p):1975 path = path[len(p):]1976break19771978 path =wildcard_decode(path)1979return path19801981defsplitFilesIntoBranches(self, commit):1982"""Look at each depotFile in the commit to figure out to what1983 branch it belongs."""19841985 branches = {}1986 fnum =01987while commit.has_key("depotFile%s"% fnum):1988 path = commit["depotFile%s"% fnum]1989 found = [p for p in self.depotPaths1990ifp4PathStartsWith(path, p)]1991if not found:1992 fnum = fnum +11993continue19941995file= {}1996file["path"] = path1997file["rev"] = commit["rev%s"% fnum]1998file["action"] = commit["action%s"% fnum]1999file["type"] = commit["type%s"% fnum]2000 fnum = fnum +120012002# start with the full relative path where this file would2003# go in a p4 client2004if self.useClientSpec:2005 relPath = self.clientSpecDirs.map_in_client(path)2006else:2007 relPath = self.stripRepoPath(path, self.depotPaths)20082009for branch in self.knownBranches.keys():2010# add a trailing slash so that a commit into qt/4.2foo2011# doesn't end up in qt/4.2, e.g.2012if relPath.startswith(branch +"/"):2013if branch not in branches:2014 branches[branch] = []2015 branches[branch].append(file)2016break20172018return branches20192020# output one file from the P4 stream2021# - helper for streamP4Files20222023defstreamOneP4File(self,file, contents):2024 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)2025if verbose:2026 sys.stderr.write("%s\n"% relPath)20272028(type_base, type_mods) =split_p4_type(file["type"])20292030 git_mode ="100644"2031if"x"in type_mods:2032 git_mode ="100755"2033if type_base =="symlink":2034 git_mode ="120000"2035# p4 print on a symlink contains "target\n"; remove the newline2036 data =''.join(contents)2037 contents = [data[:-1]]20382039if type_base =="utf16":2040# p4 delivers different text in the python output to -G2041# than it does when using "print -o", or normal p4 client2042# operations. utf16 is converted to ascii or utf8, perhaps.2043# But ascii text saved as -t utf16 is completely mangled.2044# Invoke print -o to get the real contents.2045 text =p4_read_pipe(['print','-q','-o','-',file['depotFile']])2046 contents = [ text ]20472048if type_base =="apple":2049# Apple filetype files will be streamed as a concatenation of2050# its appledouble header and the contents. This is useless2051# on both macs and non-macs. If using "print -q -o xx", it2052# will create "xx" with the data, and "%xx" with the header.2053# This is also not very useful.2054#2055# Ideally, someday, this script can learn how to generate2056# appledouble files directly and import those to git, but2057# non-mac machines can never find a use for apple filetype.2058print"\nIgnoring apple filetype file%s"%file['depotFile']2059return20602061# Perhaps windows wants unicode, utf16 newlines translated too;2062# but this is not doing it.2063if self.isWindows and type_base =="text":2064 mangled = []2065for data in contents:2066 data = data.replace("\r\n","\n")2067 mangled.append(data)2068 contents = mangled20692070# Note that we do not try to de-mangle keywords on utf16 files,2071# even though in theory somebody may want that.2072 pattern =p4_keywords_regexp_for_type(type_base, type_mods)2073if pattern:2074 regexp = re.compile(pattern, re.VERBOSE)2075 text =''.join(contents)2076 text = regexp.sub(r'$\1$', text)2077 contents = [ text ]20782079 self.gitStream.write("M%sinline%s\n"% (git_mode, relPath))20802081# total length...2082 length =02083for d in contents:2084 length = length +len(d)20852086 self.gitStream.write("data%d\n"% length)2087for d in contents:2088 self.gitStream.write(d)2089 self.gitStream.write("\n")20902091defstreamOneP4Deletion(self,file):2092 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)2093if verbose:2094 sys.stderr.write("delete%s\n"% relPath)2095 self.gitStream.write("D%s\n"% relPath)20962097# handle another chunk of streaming data2098defstreamP4FilesCb(self, marshalled):20992100if marshalled.has_key('depotFile')and self.stream_have_file_info:2101# start of a new file - output the old one first2102 self.streamOneP4File(self.stream_file, self.stream_contents)2103 self.stream_file = {}2104 self.stream_contents = []2105 self.stream_have_file_info =False21062107# pick up the new file information... for the2108# 'data' field we need to append to our array2109for k in marshalled.keys():2110if k =='data':2111 self.stream_contents.append(marshalled['data'])2112else:2113 self.stream_file[k] = marshalled[k]21142115 self.stream_have_file_info =True21162117# Stream directly from "p4 files" into "git fast-import"2118defstreamP4Files(self, files):2119 filesForCommit = []2120 filesToRead = []2121 filesToDelete = []21222123for f in files:2124# if using a client spec, only add the files that have2125# a path in the client2126if self.clientSpecDirs:2127if self.clientSpecDirs.map_in_client(f['path']) =="":2128continue21292130 filesForCommit.append(f)2131if f['action']in self.delete_actions:2132 filesToDelete.append(f)2133else:2134 filesToRead.append(f)21352136# deleted files...2137for f in filesToDelete:2138 self.streamOneP4Deletion(f)21392140iflen(filesToRead) >0:2141 self.stream_file = {}2142 self.stream_contents = []2143 self.stream_have_file_info =False21442145# curry self argument2146defstreamP4FilesCbSelf(entry):2147 self.streamP4FilesCb(entry)21482149 fileArgs = ['%s#%s'% (f['path'], f['rev'])for f in filesToRead]21502151p4CmdList(["-x","-","print"],2152 stdin=fileArgs,2153 cb=streamP4FilesCbSelf)21542155# do the last chunk2156if self.stream_file.has_key('depotFile'):2157 self.streamOneP4File(self.stream_file, self.stream_contents)21582159defmake_email(self, userid):2160if userid in self.users:2161return self.users[userid]2162else:2163return"%s<a@b>"% userid21642165# Stream a p4 tag2166defstreamTag(self, gitStream, labelName, labelDetails, commit, epoch):2167if verbose:2168print"writing tag%sfor commit%s"% (labelName, commit)2169 gitStream.write("tag%s\n"% labelName)2170 gitStream.write("from%s\n"% commit)21712172if labelDetails.has_key('Owner'):2173 owner = labelDetails["Owner"]2174else:2175 owner =None21762177# Try to use the owner of the p4 label, or failing that,2178# the current p4 user id.2179if owner:2180 email = self.make_email(owner)2181else:2182 email = self.make_email(self.p4UserId())2183 tagger ="%s %s %s"% (email, epoch, self.tz)21842185 gitStream.write("tagger%s\n"% tagger)21862187print"labelDetails=",labelDetails2188if labelDetails.has_key('Description'):2189 description = labelDetails['Description']2190else:2191 description ='Label from git p4'21922193 gitStream.write("data%d\n"%len(description))2194 gitStream.write(description)2195 gitStream.write("\n")21962197defcommit(self, details, files, branch, parent =""):2198 epoch = details["time"]2199 author = details["user"]22002201if self.verbose:2202print"commit into%s"% branch22032204# start with reading files; if that fails, we should not2205# create a commit.2206 new_files = []2207for f in files:2208if[p for p in self.branchPrefixes ifp4PathStartsWith(f['path'], p)]:2209 new_files.append(f)2210else:2211 sys.stderr.write("Ignoring file outside of prefix:%s\n"% f['path'])22122213 self.gitStream.write("commit%s\n"% branch)2214# gitStream.write("mark :%s\n" % details["change"])2215 self.committedChanges.add(int(details["change"]))2216 committer =""2217if author not in self.users:2218 self.getUserMapFromPerforceServer()2219 committer ="%s %s %s"% (self.make_email(author), epoch, self.tz)22202221 self.gitStream.write("committer%s\n"% committer)22222223 self.gitStream.write("data <<EOT\n")2224 self.gitStream.write(details["desc"])2225 self.gitStream.write("\n[git-p4: depot-paths =\"%s\": change =%s"%2226(','.join(self.branchPrefixes), details["change"]))2227iflen(details['options']) >0:2228 self.gitStream.write(": options =%s"% details['options'])2229 self.gitStream.write("]\nEOT\n\n")22302231iflen(parent) >0:2232if self.verbose:2233print"parent%s"% parent2234 self.gitStream.write("from%s\n"% parent)22352236 self.streamP4Files(new_files)2237 self.gitStream.write("\n")22382239 change =int(details["change"])22402241if self.labels.has_key(change):2242 label = self.labels[change]2243 labelDetails = label[0]2244 labelRevisions = label[1]2245if self.verbose:2246print"Change%sis labelled%s"% (change, labelDetails)22472248 files =p4CmdList(["files"] + ["%s...@%s"% (p, change)2249for p in self.branchPrefixes])22502251iflen(files) ==len(labelRevisions):22522253 cleanedFiles = {}2254for info in files:2255if info["action"]in self.delete_actions:2256continue2257 cleanedFiles[info["depotFile"]] = info["rev"]22582259if cleanedFiles == labelRevisions:2260 self.streamTag(self.gitStream,'tag_%s'% labelDetails['label'], labelDetails, branch, epoch)22612262else:2263if not self.silent:2264print("Tag%sdoes not match with change%s: files do not match."2265% (labelDetails["label"], change))22662267else:2268if not self.silent:2269print("Tag%sdoes not match with change%s: file count is different."2270% (labelDetails["label"], change))22712272# Build a dictionary of changelists and labels, for "detect-labels" option.2273defgetLabels(self):2274 self.labels = {}22752276 l =p4CmdList(["labels"] + ["%s..."% p for p in self.depotPaths])2277iflen(l) >0and not self.silent:2278print"Finding files belonging to labels in%s"% `self.depotPaths`22792280for output in l:2281 label = output["label"]2282 revisions = {}2283 newestChange =02284if self.verbose:2285print"Querying files for label%s"% label2286forfileinp4CmdList(["files"] +2287["%s...@%s"% (p, label)2288for p in self.depotPaths]):2289 revisions[file["depotFile"]] =file["rev"]2290 change =int(file["change"])2291if change > newestChange:2292 newestChange = change22932294 self.labels[newestChange] = [output, revisions]22952296if self.verbose:2297print"Label changes:%s"% self.labels.keys()22982299# Import p4 labels as git tags. A direct mapping does not2300# exist, so assume that if all the files are at the same revision2301# then we can use that, or it's something more complicated we should2302# just ignore.2303defimportP4Labels(self, stream, p4Labels):2304if verbose:2305print"import p4 labels: "+' '.join(p4Labels)23062307 ignoredP4Labels =gitConfigList("git-p4.ignoredP4Labels")2308 validLabelRegexp =gitConfig("git-p4.labelImportRegexp")2309iflen(validLabelRegexp) ==0:2310 validLabelRegexp = defaultLabelRegexp2311 m = re.compile(validLabelRegexp)23122313for name in p4Labels:2314 commitFound =False23152316if not m.match(name):2317if verbose:2318print"label%sdoes not match regexp%s"% (name,validLabelRegexp)2319continue23202321if name in ignoredP4Labels:2322continue23232324 labelDetails =p4CmdList(['label',"-o", name])[0]23252326# get the most recent changelist for each file in this label2327 change =p4Cmd(["changes","-m","1"] + ["%s...@%s"% (p, name)2328for p in self.depotPaths])23292330if change.has_key('change'):2331# find the corresponding git commit; take the oldest commit2332 changelist =int(change['change'])2333 gitCommit =read_pipe(["git","rev-list","--max-count=1",2334"--reverse",":/\[git-p4:.*change =%d\]"% changelist])2335iflen(gitCommit) ==0:2336print"could not find git commit for changelist%d"% changelist2337else:2338 gitCommit = gitCommit.strip()2339 commitFound =True2340# Convert from p4 time format2341try:2342 tmwhen = time.strptime(labelDetails['Update'],"%Y/%m/%d%H:%M:%S")2343exceptValueError:2344print"Could not convert label time%s"% labelDetail['Update']2345 tmwhen =123462347 when =int(time.mktime(tmwhen))2348 self.streamTag(stream, name, labelDetails, gitCommit, when)2349if verbose:2350print"p4 label%smapped to git commit%s"% (name, gitCommit)2351else:2352if verbose:2353print"Label%shas no changelists - possibly deleted?"% name23542355if not commitFound:2356# We can't import this label; don't try again as it will get very2357# expensive repeatedly fetching all the files for labels that will2358# never be imported. If the label is moved in the future, the2359# ignore will need to be removed manually.2360system(["git","config","--add","git-p4.ignoredP4Labels", name])23612362defguessProjectName(self):2363for p in self.depotPaths:2364if p.endswith("/"):2365 p = p[:-1]2366 p = p[p.strip().rfind("/") +1:]2367if not p.endswith("/"):2368 p +="/"2369return p23702371defgetBranchMapping(self):2372 lostAndFoundBranches =set()23732374 user =gitConfig("git-p4.branchUser")2375iflen(user) >0:2376 command ="branches -u%s"% user2377else:2378 command ="branches"23792380for info inp4CmdList(command):2381 details =p4Cmd(["branch","-o", info["branch"]])2382 viewIdx =02383while details.has_key("View%s"% viewIdx):2384 paths = details["View%s"% viewIdx].split(" ")2385 viewIdx = viewIdx +12386# require standard //depot/foo/... //depot/bar/... mapping2387iflen(paths) !=2or not paths[0].endswith("/...")or not paths[1].endswith("/..."):2388continue2389 source = paths[0]2390 destination = paths[1]2391## HACK2392ifp4PathStartsWith(source, self.depotPaths[0])andp4PathStartsWith(destination, self.depotPaths[0]):2393 source = source[len(self.depotPaths[0]):-4]2394 destination = destination[len(self.depotPaths[0]):-4]23952396if destination in self.knownBranches:2397if not self.silent:2398print"p4 branch%sdefines a mapping from%sto%s"% (info["branch"], source, destination)2399print"but there exists another mapping from%sto%salready!"% (self.knownBranches[destination], destination)2400continue24012402 self.knownBranches[destination] = source24032404 lostAndFoundBranches.discard(destination)24052406if source not in self.knownBranches:2407 lostAndFoundBranches.add(source)24082409# Perforce does not strictly require branches to be defined, so we also2410# check git config for a branch list.2411#2412# Example of branch definition in git config file:2413# [git-p4]2414# branchList=main:branchA2415# branchList=main:branchB2416# branchList=branchA:branchC2417 configBranches =gitConfigList("git-p4.branchList")2418for branch in configBranches:2419if branch:2420(source, destination) = branch.split(":")2421 self.knownBranches[destination] = source24222423 lostAndFoundBranches.discard(destination)24242425if source not in self.knownBranches:2426 lostAndFoundBranches.add(source)242724282429for branch in lostAndFoundBranches:2430 self.knownBranches[branch] = branch24312432defgetBranchMappingFromGitBranches(self):2433 branches =p4BranchesInGit(self.importIntoRemotes)2434for branch in branches.keys():2435if branch =="master":2436 branch ="main"2437else:2438 branch = branch[len(self.projectName):]2439 self.knownBranches[branch] = branch24402441deflistExistingP4GitBranches(self):2442# branches holds mapping from name to commit2443 branches =p4BranchesInGit(self.importIntoRemotes)2444 self.p4BranchesInGit = branches.keys()2445for branch in branches.keys():2446 self.initialParents[self.refPrefix + branch] = branches[branch]24472448defupdateOptionDict(self, d):2449 option_keys = {}2450if self.keepRepoPath:2451 option_keys['keepRepoPath'] =124522453 d["options"] =' '.join(sorted(option_keys.keys()))24542455defreadOptions(self, d):2456 self.keepRepoPath = (d.has_key('options')2457and('keepRepoPath'in d['options']))24582459defgitRefForBranch(self, branch):2460if branch =="main":2461return self.refPrefix +"master"24622463iflen(branch) <=0:2464return branch24652466return self.refPrefix + self.projectName + branch24672468defgitCommitByP4Change(self, ref, change):2469if self.verbose:2470print"looking in ref "+ ref +" for change%susing bisect..."% change24712472 earliestCommit =""2473 latestCommit =parseRevision(ref)24742475while True:2476if self.verbose:2477print"trying: earliest%slatest%s"% (earliestCommit, latestCommit)2478 next =read_pipe("git rev-list --bisect%s %s"% (latestCommit, earliestCommit)).strip()2479iflen(next) ==0:2480if self.verbose:2481print"argh"2482return""2483 log =extractLogMessageFromGitCommit(next)2484 settings =extractSettingsGitLog(log)2485 currentChange =int(settings['change'])2486if self.verbose:2487print"current change%s"% currentChange24882489if currentChange == change:2490if self.verbose:2491print"found%s"% next2492return next24932494if currentChange < change:2495 earliestCommit ="^%s"% next2496else:2497 latestCommit ="%s"% next24982499return""25002501defimportNewBranch(self, branch, maxChange):2502# make fast-import flush all changes to disk and update the refs using the checkpoint2503# command so that we can try to find the branch parent in the git history2504 self.gitStream.write("checkpoint\n\n");2505 self.gitStream.flush();2506 branchPrefix = self.depotPaths[0] + branch +"/"2507range="@1,%s"% maxChange2508#print "prefix" + branchPrefix2509 changes =p4ChangesForPaths([branchPrefix],range)2510iflen(changes) <=0:2511return False2512 firstChange = changes[0]2513#print "first change in branch: %s" % firstChange2514 sourceBranch = self.knownBranches[branch]2515 sourceDepotPath = self.depotPaths[0] + sourceBranch2516 sourceRef = self.gitRefForBranch(sourceBranch)2517#print "source " + sourceBranch25182519 branchParentChange =int(p4Cmd(["changes","-m","1","%s...@1,%s"% (sourceDepotPath, firstChange)])["change"])2520#print "branch parent: %s" % branchParentChange2521 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)2522iflen(gitParent) >0:2523 self.initialParents[self.gitRefForBranch(branch)] = gitParent2524#print "parent git commit: %s" % gitParent25252526 self.importChanges(changes)2527return True25282529defsearchParent(self, parent, branch, target):2530 parentFound =False2531for blob inread_pipe_lines(["git","rev-list","--reverse","--no-merges", parent]):2532 blob = blob.strip()2533iflen(read_pipe(["git","diff-tree", blob, target])) ==0:2534 parentFound =True2535if self.verbose:2536print"Found parent of%sin commit%s"% (branch, blob)2537break2538if parentFound:2539return blob2540else:2541return None25422543defimportChanges(self, changes):2544 cnt =12545for change in changes:2546 description =p4Cmd(["describe",str(change)])2547 self.updateOptionDict(description)25482549if not self.silent:2550 sys.stdout.write("\rImporting revision%s(%s%%)"% (change, cnt *100/len(changes)))2551 sys.stdout.flush()2552 cnt = cnt +125532554try:2555if self.detectBranches:2556 branches = self.splitFilesIntoBranches(description)2557for branch in branches.keys():2558## HACK --hwn2559 branchPrefix = self.depotPaths[0] + branch +"/"2560 self.branchPrefixes = [ branchPrefix ]25612562 parent =""25632564 filesForCommit = branches[branch]25652566if self.verbose:2567print"branch is%s"% branch25682569 self.updatedBranches.add(branch)25702571if branch not in self.createdBranches:2572 self.createdBranches.add(branch)2573 parent = self.knownBranches[branch]2574if parent == branch:2575 parent =""2576else:2577 fullBranch = self.projectName + branch2578if fullBranch not in self.p4BranchesInGit:2579if not self.silent:2580print("\nImporting new branch%s"% fullBranch);2581if self.importNewBranch(branch, change -1):2582 parent =""2583 self.p4BranchesInGit.append(fullBranch)2584if not self.silent:2585print("\nResuming with change%s"% change);25862587if self.verbose:2588print"parent determined through known branches:%s"% parent25892590 branch = self.gitRefForBranch(branch)2591 parent = self.gitRefForBranch(parent)25922593if self.verbose:2594print"looking for initial parent for%s; current parent is%s"% (branch, parent)25952596iflen(parent) ==0and branch in self.initialParents:2597 parent = self.initialParents[branch]2598del self.initialParents[branch]25992600 blob =None2601iflen(parent) >0:2602 tempBranch = os.path.join(self.tempBranchLocation,"%d"% (change))2603if self.verbose:2604print"Creating temporary branch: "+ tempBranch2605 self.commit(description, filesForCommit, tempBranch)2606 self.tempBranches.append(tempBranch)2607 self.checkpoint()2608 blob = self.searchParent(parent, branch, tempBranch)2609if blob:2610 self.commit(description, filesForCommit, branch, blob)2611else:2612if self.verbose:2613print"Parent of%snot found. Committing into head of%s"% (branch, parent)2614 self.commit(description, filesForCommit, branch, parent)2615else:2616 files = self.extractFilesFromCommit(description)2617 self.commit(description, files, self.branch,2618 self.initialParent)2619 self.initialParent =""2620exceptIOError:2621print self.gitError.read()2622 sys.exit(1)26232624defimportHeadRevision(self, revision):2625print"Doing initial import of%sfrom revision%sinto%s"% (' '.join(self.depotPaths), revision, self.branch)26262627 details = {}2628 details["user"] ="git perforce import user"2629 details["desc"] = ("Initial import of%sfrom the state at revision%s\n"2630% (' '.join(self.depotPaths), revision))2631 details["change"] = revision2632 newestRevision =026332634 fileCnt =02635 fileArgs = ["%s...%s"% (p,revision)for p in self.depotPaths]26362637for info inp4CmdList(["files"] + fileArgs):26382639if'code'in info and info['code'] =='error':2640 sys.stderr.write("p4 returned an error:%s\n"2641% info['data'])2642if info['data'].find("must refer to client") >=0:2643 sys.stderr.write("This particular p4 error is misleading.\n")2644 sys.stderr.write("Perhaps the depot path was misspelled.\n");2645 sys.stderr.write("Depot path:%s\n"%" ".join(self.depotPaths))2646 sys.exit(1)2647if'p4ExitCode'in info:2648 sys.stderr.write("p4 exitcode:%s\n"% info['p4ExitCode'])2649 sys.exit(1)265026512652 change =int(info["change"])2653if change > newestRevision:2654 newestRevision = change26552656if info["action"]in self.delete_actions:2657# don't increase the file cnt, otherwise details["depotFile123"] will have gaps!2658#fileCnt = fileCnt + 12659continue26602661for prop in["depotFile","rev","action","type"]:2662 details["%s%s"% (prop, fileCnt)] = info[prop]26632664 fileCnt = fileCnt +126652666 details["change"] = newestRevision26672668# Use time from top-most change so that all git p4 clones of2669# the same p4 repo have the same commit SHA1s.2670 res =p4CmdList("describe -s%d"% newestRevision)2671 newestTime =None2672for r in res:2673if r.has_key('time'):2674 newestTime =int(r['time'])2675if newestTime is None:2676die("\"describe -s\"on newest change%ddid not give a time")2677 details["time"] = newestTime26782679 self.updateOptionDict(details)2680try:2681 self.commit(details, self.extractFilesFromCommit(details), self.branch)2682exceptIOError:2683print"IO error with git fast-import. Is your git version recent enough?"2684print self.gitError.read()268526862687defrun(self, args):2688 self.depotPaths = []2689 self.changeRange =""2690 self.initialParent =""2691 self.previousDepotPaths = []26922693# map from branch depot path to parent branch2694 self.knownBranches = {}2695 self.initialParents = {}2696 self.hasOrigin =originP4BranchesExist()2697if not self.syncWithOrigin:2698 self.hasOrigin =False26992700if self.importIntoRemotes:2701 self.refPrefix ="refs/remotes/p4/"2702else:2703 self.refPrefix ="refs/heads/p4/"27042705if self.syncWithOrigin and self.hasOrigin:2706if not self.silent:2707print"Syncing with origin first by calling git fetch origin"2708system("git fetch origin")27092710iflen(self.branch) ==0:2711 self.branch = self.refPrefix +"master"2712ifgitBranchExists("refs/heads/p4")and self.importIntoRemotes:2713system("git update-ref%srefs/heads/p4"% self.branch)2714system("git branch -D p4");2715# create it /after/ importing, when master exists2716if notgitBranchExists(self.refPrefix +"HEAD")and self.importIntoRemotes andgitBranchExists(self.branch):2717system("git symbolic-ref%sHEAD%s"% (self.refPrefix, self.branch))27182719# accept either the command-line option, or the configuration variable2720if self.useClientSpec:2721# will use this after clone to set the variable2722 self.useClientSpec_from_options =True2723else:2724ifgitConfig("git-p4.useclientspec","--bool") =="true":2725 self.useClientSpec =True2726if self.useClientSpec:2727 self.clientSpecDirs =getClientSpec()27282729# TODO: should always look at previous commits,2730# merge with previous imports, if possible.2731if args == []:2732if self.hasOrigin:2733createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)2734 self.listExistingP4GitBranches()27352736iflen(self.p4BranchesInGit) >1:2737if not self.silent:2738print"Importing from/into multiple branches"2739 self.detectBranches =True27402741if self.verbose:2742print"branches:%s"% self.p4BranchesInGit27432744 p4Change =02745for branch in self.p4BranchesInGit:2746 logMsg =extractLogMessageFromGitCommit(self.refPrefix + branch)27472748 settings =extractSettingsGitLog(logMsg)27492750 self.readOptions(settings)2751if(settings.has_key('depot-paths')2752and settings.has_key('change')):2753 change =int(settings['change']) +12754 p4Change =max(p4Change, change)27552756 depotPaths =sorted(settings['depot-paths'])2757if self.previousDepotPaths == []:2758 self.previousDepotPaths = depotPaths2759else:2760 paths = []2761for(prev, cur)inzip(self.previousDepotPaths, depotPaths):2762 prev_list = prev.split("/")2763 cur_list = cur.split("/")2764for i inrange(0,min(len(cur_list),len(prev_list))):2765if cur_list[i] <> prev_list[i]:2766 i = i -12767break27682769 paths.append("/".join(cur_list[:i +1]))27702771 self.previousDepotPaths = paths27722773if p4Change >0:2774 self.depotPaths =sorted(self.previousDepotPaths)2775 self.changeRange ="@%s,#head"% p4Change2776if not self.detectBranches:2777 self.initialParent =parseRevision(self.branch)2778if not self.silent and not self.detectBranches:2779print"Performing incremental import into%sgit branch"% self.branch27802781if not self.branch.startswith("refs/"):2782 self.branch ="refs/heads/"+ self.branch27832784iflen(args) ==0and self.depotPaths:2785if not self.silent:2786print"Depot paths:%s"%' '.join(self.depotPaths)2787else:2788if self.depotPaths and self.depotPaths != args:2789print("previous import used depot path%sand now%swas specified. "2790"This doesn't work!"% (' '.join(self.depotPaths),2791' '.join(args)))2792 sys.exit(1)27932794 self.depotPaths =sorted(args)27952796 revision =""2797 self.users = {}27982799# Make sure no revision specifiers are used when --changesfile2800# is specified.2801 bad_changesfile =False2802iflen(self.changesFile) >0:2803for p in self.depotPaths:2804if p.find("@") >=0or p.find("#") >=0:2805 bad_changesfile =True2806break2807if bad_changesfile:2808die("Option --changesfile is incompatible with revision specifiers")28092810 newPaths = []2811for p in self.depotPaths:2812if p.find("@") != -1:2813 atIdx = p.index("@")2814 self.changeRange = p[atIdx:]2815if self.changeRange =="@all":2816 self.changeRange =""2817elif','not in self.changeRange:2818 revision = self.changeRange2819 self.changeRange =""2820 p = p[:atIdx]2821elif p.find("#") != -1:2822 hashIdx = p.index("#")2823 revision = p[hashIdx:]2824 p = p[:hashIdx]2825elif self.previousDepotPaths == []:2826# pay attention to changesfile, if given, else import2827# the entire p4 tree at the head revision2828iflen(self.changesFile) ==0:2829 revision ="#head"28302831 p = re.sub("\.\.\.$","", p)2832if not p.endswith("/"):2833 p +="/"28342835 newPaths.append(p)28362837 self.depotPaths = newPaths28382839# --detect-branches may change this for each branch2840 self.branchPrefixes = self.depotPaths28412842 self.loadUserMapFromCache()2843 self.labels = {}2844if self.detectLabels:2845 self.getLabels();28462847if self.detectBranches:2848## FIXME - what's a P4 projectName ?2849 self.projectName = self.guessProjectName()28502851if self.hasOrigin:2852 self.getBranchMappingFromGitBranches()2853else:2854 self.getBranchMapping()2855if self.verbose:2856print"p4-git branches:%s"% self.p4BranchesInGit2857print"initial parents:%s"% self.initialParents2858for b in self.p4BranchesInGit:2859if b !="master":28602861## FIXME2862 b = b[len(self.projectName):]2863 self.createdBranches.add(b)28642865 self.tz ="%+03d%02d"% (- time.timezone /3600, ((- time.timezone %3600) /60))28662867 importProcess = subprocess.Popen(["git","fast-import"],2868 stdin=subprocess.PIPE, stdout=subprocess.PIPE,2869 stderr=subprocess.PIPE);2870 self.gitOutput = importProcess.stdout2871 self.gitStream = importProcess.stdin2872 self.gitError = importProcess.stderr28732874if revision:2875 self.importHeadRevision(revision)2876else:2877 changes = []28782879iflen(self.changesFile) >0:2880 output =open(self.changesFile).readlines()2881 changeSet =set()2882for line in output:2883 changeSet.add(int(line))28842885for change in changeSet:2886 changes.append(change)28872888 changes.sort()2889else:2890# catch "git p4 sync" with no new branches, in a repo that2891# does not have any existing p4 branches2892iflen(args) ==0and not self.p4BranchesInGit:2893die("No remote p4 branches. Perhaps you never did\"git p4 clone\"in here.");2894if self.verbose:2895print"Getting p4 changes for%s...%s"% (', '.join(self.depotPaths),2896 self.changeRange)2897 changes =p4ChangesForPaths(self.depotPaths, self.changeRange)28982899iflen(self.maxChanges) >0:2900 changes = changes[:min(int(self.maxChanges),len(changes))]29012902iflen(changes) ==0:2903if not self.silent:2904print"No changes to import!"2905else:2906if not self.silent and not self.detectBranches:2907print"Import destination:%s"% self.branch29082909 self.updatedBranches =set()29102911 self.importChanges(changes)29122913if not self.silent:2914print""2915iflen(self.updatedBranches) >0:2916 sys.stdout.write("Updated branches: ")2917for b in self.updatedBranches:2918 sys.stdout.write("%s"% b)2919 sys.stdout.write("\n")29202921ifgitConfig("git-p4.importLabels","--bool") =="true":2922 self.importLabels =True29232924if self.importLabels:2925 p4Labels =getP4Labels(self.depotPaths)2926 gitTags =getGitTags()29272928 missingP4Labels = p4Labels - gitTags2929 self.importP4Labels(self.gitStream, missingP4Labels)29302931 self.gitStream.close()2932if importProcess.wait() !=0:2933die("fast-import failed:%s"% self.gitError.read())2934 self.gitOutput.close()2935 self.gitError.close()29362937# Cleanup temporary branches created during import2938if self.tempBranches != []:2939for branch in self.tempBranches:2940read_pipe("git update-ref -d%s"% branch)2941 os.rmdir(os.path.join(os.environ.get("GIT_DIR",".git"), self.tempBranchLocation))29422943return True29442945classP4Rebase(Command):2946def__init__(self):2947 Command.__init__(self)2948 self.options = [2949 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),2950]2951 self.importLabels =False2952 self.description = ("Fetches the latest revision from perforce and "2953+"rebases the current work (branch) against it")29542955defrun(self, args):2956 sync =P4Sync()2957 sync.importLabels = self.importLabels2958 sync.run([])29592960return self.rebase()29612962defrebase(self):2963if os.system("git update-index --refresh") !=0:2964die("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.");2965iflen(read_pipe("git diff-index HEAD --")) >0:2966die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash.");29672968[upstream, settings] =findUpstreamBranchPoint()2969iflen(upstream) ==0:2970die("Cannot find upstream branchpoint for rebase")29712972# the branchpoint may be p4/foo~3, so strip off the parent2973 upstream = re.sub("~[0-9]+$","", upstream)29742975print"Rebasing the current branch onto%s"% upstream2976 oldHead =read_pipe("git rev-parse HEAD").strip()2977system("git rebase%s"% upstream)2978system("git diff-tree --stat --summary -M%sHEAD"% oldHead)2979return True29802981classP4Clone(P4Sync):2982def__init__(self):2983 P4Sync.__init__(self)2984 self.description ="Creates a new git repository and imports from Perforce into it"2985 self.usage ="usage: %prog [options] //depot/path[@revRange]"2986 self.options += [2987 optparse.make_option("--destination", dest="cloneDestination",2988 action='store', default=None,2989help="where to leave result of the clone"),2990 optparse.make_option("-/", dest="cloneExclude",2991 action="append",type="string",2992help="exclude depot path"),2993 optparse.make_option("--bare", dest="cloneBare",2994 action="store_true", default=False),2995]2996 self.cloneDestination =None2997 self.needsGit =False2998 self.cloneBare =False29993000# This is required for the "append" cloneExclude action3001defensure_value(self, attr, value):3002if nothasattr(self, attr)orgetattr(self, attr)is None:3003setattr(self, attr, value)3004returngetattr(self, attr)30053006defdefaultDestination(self, args):3007## TODO: use common prefix of args?3008 depotPath = args[0]3009 depotDir = re.sub("(@[^@]*)$","", depotPath)3010 depotDir = re.sub("(#[^#]*)$","", depotDir)3011 depotDir = re.sub(r"\.\.\.$","", depotDir)3012 depotDir = re.sub(r"/$","", depotDir)3013return os.path.split(depotDir)[1]30143015defrun(self, args):3016iflen(args) <1:3017return False30183019if self.keepRepoPath and not self.cloneDestination:3020 sys.stderr.write("Must specify destination for --keep-path\n")3021 sys.exit(1)30223023 depotPaths = args30243025if not self.cloneDestination andlen(depotPaths) >1:3026 self.cloneDestination = depotPaths[-1]3027 depotPaths = depotPaths[:-1]30283029 self.cloneExclude = ["/"+p for p in self.cloneExclude]3030for p in depotPaths:3031if not p.startswith("//"):3032return False30333034if not self.cloneDestination:3035 self.cloneDestination = self.defaultDestination(args)30363037print"Importing from%sinto%s"% (', '.join(depotPaths), self.cloneDestination)30383039if not os.path.exists(self.cloneDestination):3040 os.makedirs(self.cloneDestination)3041chdir(self.cloneDestination)30423043 init_cmd = ["git","init"]3044if self.cloneBare:3045 init_cmd.append("--bare")3046 subprocess.check_call(init_cmd)30473048if not P4Sync.run(self, depotPaths):3049return False3050if self.branch !="master":3051if self.importIntoRemotes:3052 masterbranch ="refs/remotes/p4/master"3053else:3054 masterbranch ="refs/heads/p4/master"3055ifgitBranchExists(masterbranch):3056system("git branch master%s"% masterbranch)3057if not self.cloneBare:3058system("git checkout -f")3059else:3060print"Could not detect main branch. No checkout/master branch created."30613062# auto-set this variable if invoked with --use-client-spec3063if self.useClientSpec_from_options:3064system("git config --bool git-p4.useclientspec true")30653066return True30673068classP4Branches(Command):3069def__init__(self):3070 Command.__init__(self)3071 self.options = [ ]3072 self.description = ("Shows the git branches that hold imports and their "3073+"corresponding perforce depot paths")3074 self.verbose =False30753076defrun(self, args):3077iforiginP4BranchesExist():3078createOrUpdateBranchesFromOrigin()30793080 cmdline ="git rev-parse --symbolic "3081 cmdline +=" --remotes"30823083for line inread_pipe_lines(cmdline):3084 line = line.strip()30853086if not line.startswith('p4/')or line =="p4/HEAD":3087continue3088 branch = line30893090 log =extractLogMessageFromGitCommit("refs/remotes/%s"% branch)3091 settings =extractSettingsGitLog(log)30923093print"%s<=%s(%s)"% (branch,",".join(settings["depot-paths"]), settings["change"])3094return True30953096classHelpFormatter(optparse.IndentedHelpFormatter):3097def__init__(self):3098 optparse.IndentedHelpFormatter.__init__(self)30993100defformat_description(self, description):3101if description:3102return description +"\n"3103else:3104return""31053106defprintUsage(commands):3107print"usage:%s<command> [options]"% sys.argv[0]3108print""3109print"valid commands:%s"%", ".join(commands)3110print""3111print"Try%s<command> --help for command specific help."% sys.argv[0]3112print""31133114commands = {3115"debug": P4Debug,3116"submit": P4Submit,3117"commit": P4Submit,3118"sync": P4Sync,3119"rebase": P4Rebase,3120"clone": P4Clone,3121"rollback": P4RollBack,3122"branches": P4Branches3123}312431253126defmain():3127iflen(sys.argv[1:]) ==0:3128printUsage(commands.keys())3129 sys.exit(2)31303131 cmd =""3132 cmdName = sys.argv[1]3133try:3134 klass = commands[cmdName]3135 cmd =klass()3136exceptKeyError:3137print"unknown command%s"% cmdName3138print""3139printUsage(commands.keys())3140 sys.exit(2)31413142 options = cmd.options3143 cmd.gitdir = os.environ.get("GIT_DIR",None)31443145 args = sys.argv[2:]31463147 options.append(optparse.make_option("--verbose","-v", dest="verbose", action="store_true"))3148if cmd.needsGit:3149 options.append(optparse.make_option("--git-dir", dest="gitdir"))31503151 parser = optparse.OptionParser(cmd.usage.replace("%prog","%prog "+ cmdName),3152 options,3153 description = cmd.description,3154 formatter =HelpFormatter())31553156(cmd, args) = parser.parse_args(sys.argv[2:], cmd);3157global verbose3158 verbose = cmd.verbose3159if cmd.needsGit:3160if cmd.gitdir ==None:3161 cmd.gitdir = os.path.abspath(".git")3162if notisValidGitDir(cmd.gitdir):3163 cmd.gitdir =read_pipe("git rev-parse --git-dir").strip()3164if os.path.exists(cmd.gitdir):3165 cdup =read_pipe("git rev-parse --show-cdup").strip()3166iflen(cdup) >0:3167chdir(cdup);31683169if notisValidGitDir(cmd.gitdir):3170ifisValidGitDir(cmd.gitdir +"/.git"):3171 cmd.gitdir +="/.git"3172else:3173die("fatal: cannot locate git repository at%s"% cmd.gitdir)31743175 os.environ["GIT_DIR"] = cmd.gitdir31763177if not cmd.run(args):3178 parser.print_help()3179 sys.exit(2)318031813182if __name__ =='__main__':3183main()