1#!/usr/bin/env python 2# 3# git-p4.py -- A tool for bidirectional operation between a Perforce depot and git. 4# 5# Author: Simon Hausmann <simon@lst.de> 6# Copyright: 2007 Simon Hausmann <simon@lst.de> 7# 2007 Trolltech ASA 8# License: MIT <http://www.opensource.org/licenses/mit-license.php> 9# 10 11import optparse, sys, os, marshal, subprocess, shelve 12import tempfile, getopt, os.path, time, platform 13import re, shutil 14 15verbose =False 16 17# Only labels/tags matching this will be imported/exported 18defaultLabelRegexp = r'[a-zA-Z0-9_\-.]+$' 19 20defp4_build_cmd(cmd): 21"""Build a suitable p4 command line. 22 23 This consolidates building and returning a p4 command line into one 24 location. It means that hooking into the environment, or other configuration 25 can be done more easily. 26 """ 27 real_cmd = ["p4"] 28 29 user =gitConfig("git-p4.user") 30iflen(user) >0: 31 real_cmd += ["-u",user] 32 33 password =gitConfig("git-p4.password") 34iflen(password) >0: 35 real_cmd += ["-P", password] 36 37 port =gitConfig("git-p4.port") 38iflen(port) >0: 39 real_cmd += ["-p", port] 40 41 host =gitConfig("git-p4.host") 42iflen(host) >0: 43 real_cmd += ["-H", host] 44 45 client =gitConfig("git-p4.client") 46iflen(client) >0: 47 real_cmd += ["-c", client] 48 49 50ifisinstance(cmd,basestring): 51 real_cmd =' '.join(real_cmd) +' '+ cmd 52else: 53 real_cmd += cmd 54return real_cmd 55 56defchdir(dir): 57# P4 uses the PWD environment variable rather than getcwd(). Since we're 58# not using the shell, we have to set it ourselves. This path could 59# be relative, so go there first, then figure out where we ended up. 60 os.chdir(dir) 61 os.environ['PWD'] = os.getcwd() 62 63defdie(msg): 64if verbose: 65raiseException(msg) 66else: 67 sys.stderr.write(msg +"\n") 68 sys.exit(1) 69 70defwrite_pipe(c, stdin): 71if verbose: 72 sys.stderr.write('Writing pipe:%s\n'%str(c)) 73 74 expand =isinstance(c,basestring) 75 p = subprocess.Popen(c, stdin=subprocess.PIPE, shell=expand) 76 pipe = p.stdin 77 val = pipe.write(stdin) 78 pipe.close() 79if p.wait(): 80die('Command failed:%s'%str(c)) 81 82return val 83 84defp4_write_pipe(c, stdin): 85 real_cmd =p4_build_cmd(c) 86returnwrite_pipe(real_cmd, stdin) 87 88defread_pipe(c, ignore_error=False): 89if verbose: 90 sys.stderr.write('Reading pipe:%s\n'%str(c)) 91 92 expand =isinstance(c,basestring) 93 p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand) 94 pipe = p.stdout 95 val = pipe.read() 96if p.wait()and not ignore_error: 97die('Command failed:%s'%str(c)) 98 99return val 100 101defp4_read_pipe(c, ignore_error=False): 102 real_cmd =p4_build_cmd(c) 103returnread_pipe(real_cmd, ignore_error) 104 105defread_pipe_lines(c): 106if verbose: 107 sys.stderr.write('Reading pipe:%s\n'%str(c)) 108 109 expand =isinstance(c, basestring) 110 p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand) 111 pipe = p.stdout 112 val = pipe.readlines() 113if pipe.close()or p.wait(): 114die('Command failed:%s'%str(c)) 115 116return val 117 118defp4_read_pipe_lines(c): 119"""Specifically invoke p4 on the command supplied. """ 120 real_cmd =p4_build_cmd(c) 121returnread_pipe_lines(real_cmd) 122 123defp4_has_command(cmd): 124"""Ask p4 for help on this command. If it returns an error, the 125 command does not exist in this version of p4.""" 126 real_cmd =p4_build_cmd(["help", cmd]) 127 p = subprocess.Popen(real_cmd, stdout=subprocess.PIPE, 128 stderr=subprocess.PIPE) 129 p.communicate() 130return p.returncode ==0 131 132defsystem(cmd): 133 expand =isinstance(cmd,basestring) 134if verbose: 135 sys.stderr.write("executing%s\n"%str(cmd)) 136 subprocess.check_call(cmd, shell=expand) 137 138defp4_system(cmd): 139"""Specifically invoke p4 as the system command. """ 140 real_cmd =p4_build_cmd(cmd) 141 expand =isinstance(real_cmd, basestring) 142 subprocess.check_call(real_cmd, shell=expand) 143 144defp4_integrate(src, dest): 145p4_system(["integrate","-Dt",wildcard_encode(src),wildcard_encode(dest)]) 146 147defp4_sync(f, *options): 148p4_system(["sync"] +list(options) + [wildcard_encode(f)]) 149 150defp4_add(f): 151# forcibly add file names with wildcards 152ifwildcard_present(f): 153p4_system(["add","-f", f]) 154else: 155p4_system(["add", f]) 156 157defp4_delete(f): 158p4_system(["delete",wildcard_encode(f)]) 159 160defp4_edit(f): 161p4_system(["edit",wildcard_encode(f)]) 162 163defp4_revert(f): 164p4_system(["revert",wildcard_encode(f)]) 165 166defp4_reopen(type, f): 167p4_system(["reopen","-t",type,wildcard_encode(f)]) 168 169defp4_move(src, dest): 170p4_system(["move","-k",wildcard_encode(src),wildcard_encode(dest)]) 171 172# 173# Canonicalize the p4 type and return a tuple of the 174# base type, plus any modifiers. See "p4 help filetypes" 175# for a list and explanation. 176# 177defsplit_p4_type(p4type): 178 179 p4_filetypes_historical = { 180"ctempobj":"binary+Sw", 181"ctext":"text+C", 182"cxtext":"text+Cx", 183"ktext":"text+k", 184"kxtext":"text+kx", 185"ltext":"text+F", 186"tempobj":"binary+FSw", 187"ubinary":"binary+F", 188"uresource":"resource+F", 189"uxbinary":"binary+Fx", 190"xbinary":"binary+x", 191"xltext":"text+Fx", 192"xtempobj":"binary+Swx", 193"xtext":"text+x", 194"xunicode":"unicode+x", 195"xutf16":"utf16+x", 196} 197if p4type in p4_filetypes_historical: 198 p4type = p4_filetypes_historical[p4type] 199 mods ="" 200 s = p4type.split("+") 201 base = s[0] 202 mods ="" 203iflen(s) >1: 204 mods = s[1] 205return(base, mods) 206 207# 208# return the raw p4 type of a file (text, text+ko, etc) 209# 210defp4_type(file): 211 results =p4CmdList(["fstat","-T","headType",file]) 212return results[0]['headType'] 213 214# 215# Given a type base and modifier, return a regexp matching 216# the keywords that can be expanded in the file 217# 218defp4_keywords_regexp_for_type(base, type_mods): 219if base in("text","unicode","binary"): 220 kwords =None 221if"ko"in type_mods: 222 kwords ='Id|Header' 223elif"k"in type_mods: 224 kwords ='Id|Header|Author|Date|DateTime|Change|File|Revision' 225else: 226return None 227 pattern = r""" 228 \$ # Starts with a dollar, followed by... 229 (%s) # one of the keywords, followed by... 230 (:[^$]+)? # possibly an old expansion, followed by... 231 \$ # another dollar 232 """% kwords 233return pattern 234else: 235return None 236 237# 238# Given a file, return a regexp matching the possible 239# RCS keywords that will be expanded, or None for files 240# with kw expansion turned off. 241# 242defp4_keywords_regexp_for_file(file): 243if not os.path.exists(file): 244return None 245else: 246(type_base, type_mods) =split_p4_type(p4_type(file)) 247returnp4_keywords_regexp_for_type(type_base, type_mods) 248 249defsetP4ExecBit(file, mode): 250# Reopens an already open file and changes the execute bit to match 251# the execute bit setting in the passed in mode. 252 253 p4Type ="+x" 254 255if notisModeExec(mode): 256 p4Type =getP4OpenedType(file) 257 p4Type = re.sub('^([cku]?)x(.*)','\\1\\2', p4Type) 258 p4Type = re.sub('(.*?\+.*?)x(.*?)','\\1\\2', p4Type) 259if p4Type[-1] =="+": 260 p4Type = p4Type[0:-1] 261 262p4_reopen(p4Type,file) 263 264defgetP4OpenedType(file): 265# Returns the perforce file type for the given file. 266 267 result =p4_read_pipe(["opened",wildcard_encode(file)]) 268 match = re.match(".*\((.+)\)\r?$", result) 269if match: 270return match.group(1) 271else: 272die("Could not determine file type for%s(result: '%s')"% (file, result)) 273 274# Return the set of all p4 labels 275defgetP4Labels(depotPaths): 276 labels =set() 277ifisinstance(depotPaths,basestring): 278 depotPaths = [depotPaths] 279 280for l inp4CmdList(["labels"] + ["%s..."% p for p in depotPaths]): 281 label = l['label'] 282 labels.add(label) 283 284return labels 285 286# Return the set of all git tags 287defgetGitTags(): 288 gitTags =set() 289for line inread_pipe_lines(["git","tag"]): 290 tag = line.strip() 291 gitTags.add(tag) 292return gitTags 293 294defdiffTreePattern(): 295# This is a simple generator for the diff tree regex pattern. This could be 296# a class variable if this and parseDiffTreeEntry were a part of a class. 297 pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)') 298while True: 299yield pattern 300 301defparseDiffTreeEntry(entry): 302"""Parses a single diff tree entry into its component elements. 303 304 See git-diff-tree(1) manpage for details about the format of the diff 305 output. This method returns a dictionary with the following elements: 306 307 src_mode - The mode of the source file 308 dst_mode - The mode of the destination file 309 src_sha1 - The sha1 for the source file 310 dst_sha1 - The sha1 fr the destination file 311 status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc) 312 status_score - The score for the status (applicable for 'C' and 'R' 313 statuses). This is None if there is no score. 314 src - The path for the source file. 315 dst - The path for the destination file. This is only present for 316 copy or renames. If it is not present, this is None. 317 318 If the pattern is not matched, None is returned.""" 319 320 match =diffTreePattern().next().match(entry) 321if match: 322return{ 323'src_mode': match.group(1), 324'dst_mode': match.group(2), 325'src_sha1': match.group(3), 326'dst_sha1': match.group(4), 327'status': match.group(5), 328'status_score': match.group(6), 329'src': match.group(7), 330'dst': match.group(10) 331} 332return None 333 334defisModeExec(mode): 335# Returns True if the given git mode represents an executable file, 336# otherwise False. 337return mode[-3:] =="755" 338 339defisModeExecChanged(src_mode, dst_mode): 340returnisModeExec(src_mode) !=isModeExec(dst_mode) 341 342defp4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None): 343 344ifisinstance(cmd,basestring): 345 cmd ="-G "+ cmd 346 expand =True 347else: 348 cmd = ["-G"] + cmd 349 expand =False 350 351 cmd =p4_build_cmd(cmd) 352if verbose: 353 sys.stderr.write("Opening pipe:%s\n"%str(cmd)) 354 355# Use a temporary file to avoid deadlocks without 356# subprocess.communicate(), which would put another copy 357# of stdout into memory. 358 stdin_file =None 359if stdin is not None: 360 stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode) 361ifisinstance(stdin,basestring): 362 stdin_file.write(stdin) 363else: 364for i in stdin: 365 stdin_file.write(i +'\n') 366 stdin_file.flush() 367 stdin_file.seek(0) 368 369 p4 = subprocess.Popen(cmd, 370 shell=expand, 371 stdin=stdin_file, 372 stdout=subprocess.PIPE) 373 374 result = [] 375try: 376while True: 377 entry = marshal.load(p4.stdout) 378if cb is not None: 379cb(entry) 380else: 381 result.append(entry) 382exceptEOFError: 383pass 384 exitCode = p4.wait() 385if exitCode !=0: 386 entry = {} 387 entry["p4ExitCode"] = exitCode 388 result.append(entry) 389 390return result 391 392defp4Cmd(cmd): 393list=p4CmdList(cmd) 394 result = {} 395for entry inlist: 396 result.update(entry) 397return result; 398 399defp4Where(depotPath): 400if not depotPath.endswith("/"): 401 depotPath +="/" 402 depotPath = depotPath +"..." 403 outputList =p4CmdList(["where", depotPath]) 404 output =None 405for entry in outputList: 406if"depotFile"in entry: 407if entry["depotFile"] == depotPath: 408 output = entry 409break 410elif"data"in entry: 411 data = entry.get("data") 412 space = data.find(" ") 413if data[:space] == depotPath: 414 output = entry 415break 416if output ==None: 417return"" 418if output["code"] =="error": 419return"" 420 clientPath ="" 421if"path"in output: 422 clientPath = output.get("path") 423elif"data"in output: 424 data = output.get("data") 425 lastSpace = data.rfind(" ") 426 clientPath = data[lastSpace +1:] 427 428if clientPath.endswith("..."): 429 clientPath = clientPath[:-3] 430return clientPath 431 432defcurrentGitBranch(): 433returnread_pipe("git name-rev HEAD").split(" ")[1].strip() 434 435defisValidGitDir(path): 436if(os.path.exists(path +"/HEAD") 437and os.path.exists(path +"/refs")and os.path.exists(path +"/objects")): 438return True; 439return False 440 441defparseRevision(ref): 442returnread_pipe("git rev-parse%s"% ref).strip() 443 444defbranchExists(ref): 445 rev =read_pipe(["git","rev-parse","-q","--verify", ref], 446 ignore_error=True) 447returnlen(rev) >0 448 449defextractLogMessageFromGitCommit(commit): 450 logMessage ="" 451 452## fixme: title is first line of commit, not 1st paragraph. 453 foundTitle =False 454for log inread_pipe_lines("git cat-file commit%s"% commit): 455if not foundTitle: 456iflen(log) ==1: 457 foundTitle =True 458continue 459 460 logMessage += log 461return logMessage 462 463defextractSettingsGitLog(log): 464 values = {} 465for line in log.split("\n"): 466 line = line.strip() 467 m = re.search(r"^ *\[git-p4: (.*)\]$", line) 468if not m: 469continue 470 471 assignments = m.group(1).split(':') 472for a in assignments: 473 vals = a.split('=') 474 key = vals[0].strip() 475 val = ('='.join(vals[1:])).strip() 476if val.endswith('\"')and val.startswith('"'): 477 val = val[1:-1] 478 479 values[key] = val 480 481 paths = values.get("depot-paths") 482if not paths: 483 paths = values.get("depot-path") 484if paths: 485 values['depot-paths'] = paths.split(',') 486return values 487 488defgitBranchExists(branch): 489 proc = subprocess.Popen(["git","rev-parse", branch], 490 stderr=subprocess.PIPE, stdout=subprocess.PIPE); 491return proc.wait() ==0; 492 493_gitConfig = {} 494defgitConfig(key, args =None):# set args to "--bool", for instance 495if not _gitConfig.has_key(key): 496 argsFilter ="" 497if args !=None: 498 argsFilter ="%s"% args 499 cmd ="git config%s%s"% (argsFilter, key) 500 _gitConfig[key] =read_pipe(cmd, ignore_error=True).strip() 501return _gitConfig[key] 502 503defgitConfigList(key): 504if not _gitConfig.has_key(key): 505 _gitConfig[key] =read_pipe("git config --get-all%s"% key, ignore_error=True).strip().split(os.linesep) 506return _gitConfig[key] 507 508defp4BranchesInGit(branchesAreInRemotes =True): 509 branches = {} 510 511 cmdline ="git rev-parse --symbolic " 512if branchesAreInRemotes: 513 cmdline +=" --remotes" 514else: 515 cmdline +=" --branches" 516 517for line inread_pipe_lines(cmdline): 518 line = line.strip() 519 520## only import to p4/ 521if not line.startswith('p4/')or line =="p4/HEAD": 522continue 523 branch = line 524 525# strip off p4 526 branch = re.sub("^p4/","", line) 527 528 branches[branch] =parseRevision(line) 529return branches 530 531deffindUpstreamBranchPoint(head ="HEAD"): 532 branches =p4BranchesInGit() 533# map from depot-path to branch name 534 branchByDepotPath = {} 535for branch in branches.keys(): 536 tip = branches[branch] 537 log =extractLogMessageFromGitCommit(tip) 538 settings =extractSettingsGitLog(log) 539if settings.has_key("depot-paths"): 540 paths =",".join(settings["depot-paths"]) 541 branchByDepotPath[paths] ="remotes/p4/"+ branch 542 543 settings =None 544 parent =0 545while parent <65535: 546 commit = head +"~%s"% parent 547 log =extractLogMessageFromGitCommit(commit) 548 settings =extractSettingsGitLog(log) 549if settings.has_key("depot-paths"): 550 paths =",".join(settings["depot-paths"]) 551if branchByDepotPath.has_key(paths): 552return[branchByDepotPath[paths], settings] 553 554 parent = parent +1 555 556return["", settings] 557 558defcreateOrUpdateBranchesFromOrigin(localRefPrefix ="refs/remotes/p4/", silent=True): 559if not silent: 560print("Creating/updating branch(es) in%sbased on origin branch(es)" 561% localRefPrefix) 562 563 originPrefix ="origin/p4/" 564 565for line inread_pipe_lines("git rev-parse --symbolic --remotes"): 566 line = line.strip() 567if(not line.startswith(originPrefix))or line.endswith("HEAD"): 568continue 569 570 headName = line[len(originPrefix):] 571 remoteHead = localRefPrefix + headName 572 originHead = line 573 574 original =extractSettingsGitLog(extractLogMessageFromGitCommit(originHead)) 575if(not original.has_key('depot-paths') 576or not original.has_key('change')): 577continue 578 579 update =False 580if notgitBranchExists(remoteHead): 581if verbose: 582print"creating%s"% remoteHead 583 update =True 584else: 585 settings =extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead)) 586if settings.has_key('change') >0: 587if settings['depot-paths'] == original['depot-paths']: 588 originP4Change =int(original['change']) 589 p4Change =int(settings['change']) 590if originP4Change > p4Change: 591print("%s(%s) is newer than%s(%s). " 592"Updating p4 branch from origin." 593% (originHead, originP4Change, 594 remoteHead, p4Change)) 595 update =True 596else: 597print("Ignoring:%swas imported from%swhile " 598"%swas imported from%s" 599% (originHead,','.join(original['depot-paths']), 600 remoteHead,','.join(settings['depot-paths']))) 601 602if update: 603system("git update-ref%s %s"% (remoteHead, originHead)) 604 605deforiginP4BranchesExist(): 606returngitBranchExists("origin")orgitBranchExists("origin/p4")orgitBranchExists("origin/p4/master") 607 608defp4ChangesForPaths(depotPaths, changeRange): 609assert depotPaths 610 cmd = ['changes'] 611for p in depotPaths: 612 cmd += ["%s...%s"% (p, changeRange)] 613 output =p4_read_pipe_lines(cmd) 614 615 changes = {} 616for line in output: 617 changeNum =int(line.split(" ")[1]) 618 changes[changeNum] =True 619 620 changelist = changes.keys() 621 changelist.sort() 622return changelist 623 624defp4PathStartsWith(path, prefix): 625# This method tries to remedy a potential mixed-case issue: 626# 627# If UserA adds //depot/DirA/file1 628# and UserB adds //depot/dira/file2 629# 630# we may or may not have a problem. If you have core.ignorecase=true, 631# we treat DirA and dira as the same directory 632 ignorecase =gitConfig("core.ignorecase","--bool") =="true" 633if ignorecase: 634return path.lower().startswith(prefix.lower()) 635return path.startswith(prefix) 636 637defgetClientSpec(): 638"""Look at the p4 client spec, create a View() object that contains 639 all the mappings, and return it.""" 640 641 specList =p4CmdList("client -o") 642iflen(specList) !=1: 643die('Output from "client -o" is%dlines, expecting 1'% 644len(specList)) 645 646# dictionary of all client parameters 647 entry = specList[0] 648 649# just the keys that start with "View" 650 view_keys = [ k for k in entry.keys()if k.startswith("View") ] 651 652# hold this new View 653 view =View() 654 655# append the lines, in order, to the view 656for view_num inrange(len(view_keys)): 657 k ="View%d"% view_num 658if k not in view_keys: 659die("Expected view key%smissing"% k) 660 view.append(entry[k]) 661 662return view 663 664defgetClientRoot(): 665"""Grab the client directory.""" 666 667 output =p4CmdList("client -o") 668iflen(output) !=1: 669die('Output from "client -o" is%dlines, expecting 1'%len(output)) 670 671 entry = output[0] 672if"Root"not in entry: 673die('Client has no "Root"') 674 675return entry["Root"] 676 677# 678# P4 wildcards are not allowed in filenames. P4 complains 679# if you simply add them, but you can force it with "-f", in 680# which case it translates them into %xx encoding internally. 681# 682defwildcard_decode(path): 683# Search for and fix just these four characters. Do % last so 684# that fixing it does not inadvertently create new %-escapes. 685# Cannot have * in a filename in windows; untested as to 686# what p4 would do in such a case. 687if not platform.system() =="Windows": 688 path = path.replace("%2A","*") 689 path = path.replace("%23","#") \ 690.replace("%40","@") \ 691.replace("%25","%") 692return path 693 694defwildcard_encode(path): 695# do % first to avoid double-encoding the %s introduced here 696 path = path.replace("%","%25") \ 697.replace("*","%2A") \ 698.replace("#","%23") \ 699.replace("@","%40") 700return path 701 702defwildcard_present(path): 703return path.translate(None,"*#@%") != path 704 705class Command: 706def__init__(self): 707 self.usage ="usage: %prog [options]" 708 self.needsGit =True 709 self.verbose =False 710 711class P4UserMap: 712def__init__(self): 713 self.userMapFromPerforceServer =False 714 self.myP4UserId =None 715 716defp4UserId(self): 717if self.myP4UserId: 718return self.myP4UserId 719 720 results =p4CmdList("user -o") 721for r in results: 722if r.has_key('User'): 723 self.myP4UserId = r['User'] 724return r['User'] 725die("Could not find your p4 user id") 726 727defp4UserIsMe(self, p4User): 728# return True if the given p4 user is actually me 729 me = self.p4UserId() 730if not p4User or p4User != me: 731return False 732else: 733return True 734 735defgetUserCacheFilename(self): 736 home = os.environ.get("HOME", os.environ.get("USERPROFILE")) 737return home +"/.gitp4-usercache.txt" 738 739defgetUserMapFromPerforceServer(self): 740if self.userMapFromPerforceServer: 741return 742 self.users = {} 743 self.emails = {} 744 745for output inp4CmdList("users"): 746if not output.has_key("User"): 747continue 748 self.users[output["User"]] = output["FullName"] +" <"+ output["Email"] +">" 749 self.emails[output["Email"]] = output["User"] 750 751 752 s ='' 753for(key, val)in self.users.items(): 754 s +="%s\t%s\n"% (key.expandtabs(1), val.expandtabs(1)) 755 756open(self.getUserCacheFilename(),"wb").write(s) 757 self.userMapFromPerforceServer =True 758 759defloadUserMapFromCache(self): 760 self.users = {} 761 self.userMapFromPerforceServer =False 762try: 763 cache =open(self.getUserCacheFilename(),"rb") 764 lines = cache.readlines() 765 cache.close() 766for line in lines: 767 entry = line.strip().split("\t") 768 self.users[entry[0]] = entry[1] 769exceptIOError: 770 self.getUserMapFromPerforceServer() 771 772classP4Debug(Command): 773def__init__(self): 774 Command.__init__(self) 775 self.options = [] 776 self.description ="A tool to debug the output of p4 -G." 777 self.needsGit =False 778 779defrun(self, args): 780 j =0 781for output inp4CmdList(args): 782print'Element:%d'% j 783 j +=1 784print output 785return True 786 787classP4RollBack(Command): 788def__init__(self): 789 Command.__init__(self) 790 self.options = [ 791 optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true") 792] 793 self.description ="A tool to debug the multi-branch import. Don't use :)" 794 self.rollbackLocalBranches =False 795 796defrun(self, args): 797iflen(args) !=1: 798return False 799 maxChange =int(args[0]) 800 801if"p4ExitCode"inp4Cmd("changes -m 1"): 802die("Problems executing p4"); 803 804if self.rollbackLocalBranches: 805 refPrefix ="refs/heads/" 806 lines =read_pipe_lines("git rev-parse --symbolic --branches") 807else: 808 refPrefix ="refs/remotes/" 809 lines =read_pipe_lines("git rev-parse --symbolic --remotes") 810 811for line in lines: 812if self.rollbackLocalBranches or(line.startswith("p4/")and line !="p4/HEAD\n"): 813 line = line.strip() 814 ref = refPrefix + line 815 log =extractLogMessageFromGitCommit(ref) 816 settings =extractSettingsGitLog(log) 817 818 depotPaths = settings['depot-paths'] 819 change = settings['change'] 820 821 changed =False 822 823iflen(p4Cmd("changes -m 1 "+' '.join(['%s...@%s'% (p, maxChange) 824for p in depotPaths]))) ==0: 825print"Branch%sdid not exist at change%s, deleting."% (ref, maxChange) 826system("git update-ref -d%s`git rev-parse%s`"% (ref, ref)) 827continue 828 829while change andint(change) > maxChange: 830 changed =True 831if self.verbose: 832print"%sis at%s; rewinding towards%s"% (ref, change, maxChange) 833system("git update-ref%s\"%s^\""% (ref, ref)) 834 log =extractLogMessageFromGitCommit(ref) 835 settings =extractSettingsGitLog(log) 836 837 838 depotPaths = settings['depot-paths'] 839 change = settings['change'] 840 841if changed: 842print"%srewound to%s"% (ref, change) 843 844return True 845 846classP4Submit(Command, P4UserMap): 847def__init__(self): 848 Command.__init__(self) 849 P4UserMap.__init__(self) 850 self.options = [ 851 optparse.make_option("--origin", dest="origin"), 852 optparse.make_option("-M", dest="detectRenames", action="store_true"), 853# preserve the user, requires relevant p4 permissions 854 optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"), 855 optparse.make_option("--export-labels", dest="exportLabels", action="store_true"), 856] 857 self.description ="Submit changes from git to the perforce depot." 858 self.usage +=" [name of git branch to submit into perforce depot]" 859 self.origin ="" 860 self.detectRenames =False 861 self.preserveUser =gitConfig("git-p4.preserveUser").lower() =="true" 862 self.isWindows = (platform.system() =="Windows") 863 self.exportLabels =False 864 self.p4HasMoveCommand =p4_has_command("move") 865 866defcheck(self): 867iflen(p4CmdList("opened ...")) >0: 868die("You have files opened with perforce! Close them before starting the sync.") 869 870defseparate_jobs_from_description(self, message): 871"""Extract and return a possible Jobs field in the commit 872 message. It goes into a separate section in the p4 change 873 specification. 874 875 A jobs line starts with "Jobs:" and looks like a new field 876 in a form. Values are white-space separated on the same 877 line or on following lines that start with a tab. 878 879 This does not parse and extract the full git commit message 880 like a p4 form. It just sees the Jobs: line as a marker 881 to pass everything from then on directly into the p4 form, 882 but outside the description section. 883 884 Return a tuple (stripped log message, jobs string).""" 885 886 m = re.search(r'^Jobs:', message, re.MULTILINE) 887if m is None: 888return(message,None) 889 890 jobtext = message[m.start():] 891 stripped_message = message[:m.start()].rstrip() 892return(stripped_message, jobtext) 893 894defprepareLogMessage(self, template, message, jobs): 895"""Edits the template returned from "p4 change -o" to insert 896 the message in the Description field, and the jobs text in 897 the Jobs field.""" 898 result ="" 899 900 inDescriptionSection =False 901 902for line in template.split("\n"): 903if line.startswith("#"): 904 result += line +"\n" 905continue 906 907if inDescriptionSection: 908if line.startswith("Files:")or line.startswith("Jobs:"): 909 inDescriptionSection =False 910# insert Jobs section 911if jobs: 912 result += jobs +"\n" 913else: 914continue 915else: 916if line.startswith("Description:"): 917 inDescriptionSection =True 918 line +="\n" 919for messageLine in message.split("\n"): 920 line +="\t"+ messageLine +"\n" 921 922 result += line +"\n" 923 924return result 925 926defpatchRCSKeywords(self,file, pattern): 927# Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern 928(handle, outFileName) = tempfile.mkstemp(dir='.') 929try: 930 outFile = os.fdopen(handle,"w+") 931 inFile =open(file,"r") 932 regexp = re.compile(pattern, re.VERBOSE) 933for line in inFile.readlines(): 934 line = regexp.sub(r'$\1$', line) 935 outFile.write(line) 936 inFile.close() 937 outFile.close() 938# Forcibly overwrite the original file 939 os.unlink(file) 940 shutil.move(outFileName,file) 941except: 942# cleanup our temporary file 943 os.unlink(outFileName) 944print"Failed to strip RCS keywords in%s"%file 945raise 946 947print"Patched up RCS keywords in%s"%file 948 949defp4UserForCommit(self,id): 950# Return the tuple (perforce user,git email) for a given git commit id 951 self.getUserMapFromPerforceServer() 952 gitEmail =read_pipe("git log --max-count=1 --format='%%ae'%s"%id) 953 gitEmail = gitEmail.strip() 954if not self.emails.has_key(gitEmail): 955return(None,gitEmail) 956else: 957return(self.emails[gitEmail],gitEmail) 958 959defcheckValidP4Users(self,commits): 960# check if any git authors cannot be mapped to p4 users 961foridin commits: 962(user,email) = self.p4UserForCommit(id) 963if not user: 964 msg ="Cannot find p4 user for email%sin commit%s."% (email,id) 965ifgitConfig('git-p4.allowMissingP4Users').lower() =="true": 966print"%s"% msg 967else: 968die("Error:%s\nSet git-p4.allowMissingP4Users to true to allow this."% msg) 969 970deflastP4Changelist(self): 971# Get back the last changelist number submitted in this client spec. This 972# then gets used to patch up the username in the change. If the same 973# client spec is being used by multiple processes then this might go 974# wrong. 975 results =p4CmdList("client -o")# find the current client 976 client =None 977for r in results: 978if r.has_key('Client'): 979 client = r['Client'] 980break 981if not client: 982die("could not get client spec") 983 results =p4CmdList(["changes","-c", client,"-m","1"]) 984for r in results: 985if r.has_key('change'): 986return r['change'] 987die("Could not get changelist number for last submit - cannot patch up user details") 988 989defmodifyChangelistUser(self, changelist, newUser): 990# fixup the user field of a changelist after it has been submitted. 991 changes =p4CmdList("change -o%s"% changelist) 992iflen(changes) !=1: 993die("Bad output from p4 change modifying%sto user%s"% 994(changelist, newUser)) 995 996 c = changes[0] 997if c['User'] == newUser:return# nothing to do 998 c['User'] = newUser 999input= marshal.dumps(c)10001001 result =p4CmdList("change -f -i", stdin=input)1002for r in result:1003if r.has_key('code'):1004if r['code'] =='error':1005die("Could not modify user field of changelist%sto%s:%s"% (changelist, newUser, r['data']))1006if r.has_key('data'):1007print("Updated user field for changelist%sto%s"% (changelist, newUser))1008return1009die("Could not modify user field of changelist%sto%s"% (changelist, newUser))10101011defcanChangeChangelists(self):1012# check to see if we have p4 admin or super-user permissions, either of1013# which are required to modify changelists.1014 results =p4CmdList(["protects", self.depotPath])1015for r in results:1016if r.has_key('perm'):1017if r['perm'] =='admin':1018return11019if r['perm'] =='super':1020return11021return010221023defprepareSubmitTemplate(self):1024"""Run "p4 change -o" to grab a change specification template.1025 This does not use "p4 -G", as it is nice to keep the submission1026 template in original order, since a human might edit it.10271028 Remove lines in the Files section that show changes to files1029 outside the depot path we're committing into."""10301031 template =""1032 inFilesSection =False1033for line inp4_read_pipe_lines(['change','-o']):1034if line.endswith("\r\n"):1035 line = line[:-2] +"\n"1036if inFilesSection:1037if line.startswith("\t"):1038# path starts and ends with a tab1039 path = line[1:]1040 lastTab = path.rfind("\t")1041if lastTab != -1:1042 path = path[:lastTab]1043if notp4PathStartsWith(path, self.depotPath):1044continue1045else:1046 inFilesSection =False1047else:1048if line.startswith("Files:"):1049 inFilesSection =True10501051 template += line10521053return template10541055defedit_template(self, template_file):1056"""Invoke the editor to let the user change the submission1057 message. Return true if okay to continue with the submit."""10581059# if configured to skip the editing part, just submit1060ifgitConfig("git-p4.skipSubmitEdit") =="true":1061return True10621063# look at the modification time, to check later if the user saved1064# the file1065 mtime = os.stat(template_file).st_mtime10661067# invoke the editor1068if os.environ.has_key("P4EDITOR")and(os.environ.get("P4EDITOR") !=""):1069 editor = os.environ.get("P4EDITOR")1070else:1071 editor =read_pipe("git var GIT_EDITOR").strip()1072system(editor +" "+ template_file)10731074# If the file was not saved, prompt to see if this patch should1075# be skipped. But skip this verification step if configured so.1076ifgitConfig("git-p4.skipSubmitEditCheck") =="true":1077return True10781079# modification time updated means user saved the file1080if os.stat(template_file).st_mtime > mtime:1081return True10821083while True:1084 response =raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")1085if response =='y':1086return True1087if response =='n':1088return False10891090defapplyCommit(self,id):1091"""Apply one commit, return True if it succeeded."""10921093print"Applying",read_pipe(["git","show","-s",1094"--format=format:%h%s",id])10951096(p4User, gitEmail) = self.p4UserForCommit(id)10971098 diff =read_pipe_lines("git diff-tree -r%s\"%s^\" \"%s\""% (self.diffOpts,id,id))1099 filesToAdd =set()1100 filesToDelete =set()1101 editedFiles =set()1102 pureRenameCopy =set()1103 filesToChangeExecBit = {}11041105for line in diff:1106 diff =parseDiffTreeEntry(line)1107 modifier = diff['status']1108 path = diff['src']1109if modifier =="M":1110p4_edit(path)1111ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1112 filesToChangeExecBit[path] = diff['dst_mode']1113 editedFiles.add(path)1114elif modifier =="A":1115 filesToAdd.add(path)1116 filesToChangeExecBit[path] = diff['dst_mode']1117if path in filesToDelete:1118 filesToDelete.remove(path)1119elif modifier =="D":1120 filesToDelete.add(path)1121if path in filesToAdd:1122 filesToAdd.remove(path)1123elif modifier =="C":1124 src, dest = diff['src'], diff['dst']1125p4_integrate(src, dest)1126 pureRenameCopy.add(dest)1127if diff['src_sha1'] != diff['dst_sha1']:1128p4_edit(dest)1129 pureRenameCopy.discard(dest)1130ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1131p4_edit(dest)1132 pureRenameCopy.discard(dest)1133 filesToChangeExecBit[dest] = diff['dst_mode']1134 os.unlink(dest)1135 editedFiles.add(dest)1136elif modifier =="R":1137 src, dest = diff['src'], diff['dst']1138if self.p4HasMoveCommand:1139p4_edit(src)# src must be open before move1140p4_move(src, dest)# opens for (move/delete, move/add)1141else:1142p4_integrate(src, dest)1143if diff['src_sha1'] != diff['dst_sha1']:1144p4_edit(dest)1145else:1146 pureRenameCopy.add(dest)1147ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1148if not self.p4HasMoveCommand:1149p4_edit(dest)# with move: already open, writable1150 filesToChangeExecBit[dest] = diff['dst_mode']1151if not self.p4HasMoveCommand:1152 os.unlink(dest)1153 filesToDelete.add(src)1154 editedFiles.add(dest)1155else:1156die("unknown modifier%sfor%s"% (modifier, path))11571158 diffcmd ="git format-patch -k --stdout\"%s^\"..\"%s\""% (id,id)1159 patchcmd = diffcmd +" | git apply "1160 tryPatchCmd = patchcmd +"--check -"1161 applyPatchCmd = patchcmd +"--check --apply -"1162 patch_succeeded =True11631164if os.system(tryPatchCmd) !=0:1165 fixed_rcs_keywords =False1166 patch_succeeded =False1167print"Unfortunately applying the change failed!"11681169# Patch failed, maybe it's just RCS keyword woes. Look through1170# the patch to see if that's possible.1171ifgitConfig("git-p4.attemptRCSCleanup","--bool") =="true":1172file=None1173 pattern =None1174 kwfiles = {}1175forfilein editedFiles | filesToDelete:1176# did this file's delta contain RCS keywords?1177 pattern =p4_keywords_regexp_for_file(file)11781179if pattern:1180# this file is a possibility...look for RCS keywords.1181 regexp = re.compile(pattern, re.VERBOSE)1182for line inread_pipe_lines(["git","diff","%s^..%s"% (id,id),file]):1183if regexp.search(line):1184if verbose:1185print"got keyword match on%sin%sin%s"% (pattern, line,file)1186 kwfiles[file] = pattern1187break11881189forfilein kwfiles:1190if verbose:1191print"zapping%swith%s"% (line,pattern)1192 self.patchRCSKeywords(file, kwfiles[file])1193 fixed_rcs_keywords =True11941195if fixed_rcs_keywords:1196print"Retrying the patch with RCS keywords cleaned up"1197if os.system(tryPatchCmd) ==0:1198 patch_succeeded =True11991200if not patch_succeeded:1201print"What do you want to do?"1202 response ="x"1203while response !="s"and response !="a"and response !="w":1204 response =raw_input("[s]kip this patch / [a]pply the patch forcibly "1205"and with .rej files / [w]rite the patch to a file (patch.txt) ")1206if response =="s":1207print"Skipping! Good luck with the next patches..."1208for f in editedFiles:1209p4_revert(f)1210for f in filesToAdd:1211 os.remove(f)1212return False1213elif response =="a":1214 os.system(applyPatchCmd)1215iflen(filesToAdd) >0:1216print"You may also want to call p4 add on the following files:"1217print" ".join(filesToAdd)1218iflen(filesToDelete):1219print"The following files should be scheduled for deletion with p4 delete:"1220print" ".join(filesToDelete)1221die("Please resolve and submit the conflict manually and "1222+"continue afterwards with git p4 submit --continue")1223elif response =="w":1224system(diffcmd +" > patch.txt")1225print"Patch saved to patch.txt in%s!"% self.clientPath1226die("Please resolve and submit the conflict manually and "1227"continue afterwards with git p4 submit --continue")12281229system(applyPatchCmd)12301231for f in filesToAdd:1232p4_add(f)1233for f in filesToDelete:1234p4_revert(f)1235p4_delete(f)12361237# Set/clear executable bits1238for f in filesToChangeExecBit.keys():1239 mode = filesToChangeExecBit[f]1240setP4ExecBit(f, mode)12411242 logMessage =extractLogMessageFromGitCommit(id)1243 logMessage = logMessage.strip()1244(logMessage, jobs) = self.separate_jobs_from_description(logMessage)12451246 template = self.prepareSubmitTemplate()1247 submitTemplate = self.prepareLogMessage(template, logMessage, jobs)12481249if self.preserveUser:1250 submitTemplate = submitTemplate + ("\n######## Actual user%s, modified after commit\n"% p4User)12511252if os.environ.has_key("P4DIFF"):1253del(os.environ["P4DIFF"])1254 diff =""1255for editedFile in editedFiles:1256 diff +=p4_read_pipe(['diff','-du',1257wildcard_encode(editedFile)])12581259 newdiff =""1260for newFile in filesToAdd:1261 newdiff +="==== new file ====\n"1262 newdiff +="--- /dev/null\n"1263 newdiff +="+++%s\n"% newFile1264 f =open(newFile,"r")1265for line in f.readlines():1266 newdiff +="+"+ line1267 f.close()12681269if self.checkAuthorship and not self.p4UserIsMe(p4User):1270 submitTemplate +="######## git author%sdoes not match your p4 account.\n"% gitEmail1271 submitTemplate +="######## Use option --preserve-user to modify authorship.\n"1272 submitTemplate +="######## Variable git-p4.skipUserNameCheck hides this message.\n"12731274 separatorLine ="######## everything below this line is just the diff #######\n"12751276(handle, fileName) = tempfile.mkstemp()1277 tmpFile = os.fdopen(handle,"w+")1278if self.isWindows:1279 submitTemplate = submitTemplate.replace("\n","\r\n")1280 separatorLine = separatorLine.replace("\n","\r\n")1281 newdiff = newdiff.replace("\n","\r\n")1282 tmpFile.write(submitTemplate + separatorLine + diff + newdiff)1283 tmpFile.close()12841285if self.edit_template(fileName):1286# read the edited message and submit1287 tmpFile =open(fileName,"rb")1288 message = tmpFile.read()1289 tmpFile.close()1290 submitTemplate = message[:message.index(separatorLine)]1291if self.isWindows:1292 submitTemplate = submitTemplate.replace("\r\n","\n")1293p4_write_pipe(['submit','-i'], submitTemplate)12941295if self.preserveUser:1296if p4User:1297# Get last changelist number. Cannot easily get it from1298# the submit command output as the output is1299# unmarshalled.1300 changelist = self.lastP4Changelist()1301 self.modifyChangelistUser(changelist, p4User)13021303# The rename/copy happened by applying a patch that created a1304# new file. This leaves it writable, which confuses p4.1305for f in pureRenameCopy:1306p4_sync(f,"-f")13071308else:1309# skip this patch1310print"Submission cancelled, undoing p4 changes."1311for f in editedFiles:1312p4_revert(f)1313for f in filesToAdd:1314p4_revert(f)1315 os.remove(f)13161317 os.remove(fileName)1318return True# success13191320# Export git tags as p4 labels. Create a p4 label and then tag1321# with that.1322defexportGitTags(self, gitTags):1323 validLabelRegexp =gitConfig("git-p4.labelExportRegexp")1324iflen(validLabelRegexp) ==0:1325 validLabelRegexp = defaultLabelRegexp1326 m = re.compile(validLabelRegexp)13271328for name in gitTags:13291330if not m.match(name):1331if verbose:1332print"tag%sdoes not match regexp%s"% (name, validLabelRegexp)1333continue13341335# Get the p4 commit this corresponds to1336 logMessage =extractLogMessageFromGitCommit(name)1337 values =extractSettingsGitLog(logMessage)13381339if not values.has_key('change'):1340# a tag pointing to something not sent to p4; ignore1341if verbose:1342print"git tag%sdoes not give a p4 commit"% name1343continue1344else:1345 changelist = values['change']13461347# Get the tag details.1348 inHeader =True1349 isAnnotated =False1350 body = []1351for l inread_pipe_lines(["git","cat-file","-p", name]):1352 l = l.strip()1353if inHeader:1354if re.match(r'tag\s+', l):1355 isAnnotated =True1356elif re.match(r'\s*$', l):1357 inHeader =False1358continue1359else:1360 body.append(l)13611362if not isAnnotated:1363 body = ["lightweight tag imported by git p4\n"]13641365# Create the label - use the same view as the client spec we are using1366 clientSpec =getClientSpec()13671368 labelTemplate ="Label:%s\n"% name1369 labelTemplate +="Description:\n"1370for b in body:1371 labelTemplate +="\t"+ b +"\n"1372 labelTemplate +="View:\n"1373for mapping in clientSpec.mappings:1374 labelTemplate +="\t%s\n"% mapping.depot_side.path13751376p4_write_pipe(["label","-i"], labelTemplate)13771378# Use the label1379p4_system(["tag","-l", name] +1380["%s@%s"% (mapping.depot_side.path, changelist)for mapping in clientSpec.mappings])13811382if verbose:1383print"created p4 label for tag%s"% name13841385defrun(self, args):1386iflen(args) ==0:1387 self.master =currentGitBranch()1388iflen(self.master) ==0or notgitBranchExists("refs/heads/%s"% self.master):1389die("Detecting current git branch failed!")1390eliflen(args) ==1:1391 self.master = args[0]1392if notbranchExists(self.master):1393die("Branch%sdoes not exist"% self.master)1394else:1395return False13961397 allowSubmit =gitConfig("git-p4.allowSubmit")1398iflen(allowSubmit) >0and not self.master in allowSubmit.split(","):1399die("%sis not in git-p4.allowSubmit"% self.master)14001401[upstream, settings] =findUpstreamBranchPoint()1402 self.depotPath = settings['depot-paths'][0]1403iflen(self.origin) ==0:1404 self.origin = upstream14051406if self.preserveUser:1407if not self.canChangeChangelists():1408die("Cannot preserve user names without p4 super-user or admin permissions")14091410if self.verbose:1411print"Origin branch is "+ self.origin14121413iflen(self.depotPath) ==0:1414print"Internal error: cannot locate perforce depot path from existing branches"1415 sys.exit(128)14161417 self.useClientSpec =False1418ifgitConfig("git-p4.useclientspec","--bool") =="true":1419 self.useClientSpec =True1420if self.useClientSpec:1421 self.clientSpecDirs =getClientSpec()14221423if self.useClientSpec:1424# all files are relative to the client spec1425 self.clientPath =getClientRoot()1426else:1427 self.clientPath =p4Where(self.depotPath)14281429if self.clientPath =="":1430die("Error: Cannot locate perforce checkout of%sin client view"% self.depotPath)14311432print"Perforce checkout for depot path%slocated at%s"% (self.depotPath, self.clientPath)1433 self.oldWorkingDirectory = os.getcwd()14341435# ensure the clientPath exists1436 new_client_dir =False1437if not os.path.exists(self.clientPath):1438 new_client_dir =True1439 os.makedirs(self.clientPath)14401441chdir(self.clientPath)1442print"Synchronizing p4 checkout..."1443if new_client_dir:1444# old one was destroyed, and maybe nobody told p41445p4_sync("...","-f")1446else:1447p4_sync("...")1448 self.check()14491450 commits = []1451for line inread_pipe_lines("git rev-list --no-merges%s..%s"% (self.origin, self.master)):1452 commits.append(line.strip())1453 commits.reverse()14541455if self.preserveUser or(gitConfig("git-p4.skipUserNameCheck") =="true"):1456 self.checkAuthorship =False1457else:1458 self.checkAuthorship =True14591460if self.preserveUser:1461 self.checkValidP4Users(commits)14621463#1464# Build up a set of options to be passed to diff when1465# submitting each commit to p4.1466#1467if self.detectRenames:1468# command-line -M arg1469 self.diffOpts ="-M"1470else:1471# If not explicitly set check the config variable1472 detectRenames =gitConfig("git-p4.detectRenames")14731474if detectRenames.lower() =="false"or detectRenames =="":1475 self.diffOpts =""1476elif detectRenames.lower() =="true":1477 self.diffOpts ="-M"1478else:1479 self.diffOpts ="-M%s"% detectRenames14801481# no command-line arg for -C or --find-copies-harder, just1482# config variables1483 detectCopies =gitConfig("git-p4.detectCopies")1484if detectCopies.lower() =="false"or detectCopies =="":1485pass1486elif detectCopies.lower() =="true":1487 self.diffOpts +=" -C"1488else:1489 self.diffOpts +=" -C%s"% detectCopies14901491ifgitConfig("git-p4.detectCopiesHarder","--bool") =="true":1492 self.diffOpts +=" --find-copies-harder"14931494 applied = []1495for commit in commits:1496 ok = self.applyCommit(commit)1497if ok:1498 applied.append(commit)14991500chdir(self.oldWorkingDirectory)15011502iflen(commits) ==len(applied):1503print"All commits applied!"15041505 sync =P4Sync()1506 sync.run([])15071508 rebase =P4Rebase()1509 rebase.rebase()15101511else:1512iflen(applied) ==0:1513print"No commits applied."1514else:1515print"Applied only the commits marked with '*':"1516for c in commits:1517if c in applied:1518 star ="*"1519else:1520 star =" "1521print star,read_pipe(["git","show","-s",1522"--format=format:%h%s", c])1523print"You will have to do 'git p4 sync' and rebase."15241525ifgitConfig("git-p4.exportLabels","--bool") =="true":1526 self.exportLabels =True15271528if self.exportLabels:1529 p4Labels =getP4Labels(self.depotPath)1530 gitTags =getGitTags()15311532 missingGitTags = gitTags - p4Labels1533 self.exportGitTags(missingGitTags)15341535# exit with error unless everything applied perfecly1536iflen(commits) !=len(applied):1537 sys.exit(1)15381539return True15401541classView(object):1542"""Represent a p4 view ("p4 help views"), and map files in a1543 repo according to the view."""15441545classPath(object):1546"""A depot or client path, possibly containing wildcards.1547 The only one supported is ... at the end, currently.1548 Initialize with the full path, with //depot or //client."""15491550def__init__(self, path, is_depot):1551 self.path = path1552 self.is_depot = is_depot1553 self.find_wildcards()1554# remember the prefix bit, useful for relative mappings1555 m = re.match("(//[^/]+/)", self.path)1556if not m:1557die("Path%sdoes not start with //prefix/"% self.path)1558 prefix = m.group(1)1559if not self.is_depot:1560# strip //client/ on client paths1561 self.path = self.path[len(prefix):]15621563deffind_wildcards(self):1564"""Make sure wildcards are valid, and set up internal1565 variables."""15661567 self.ends_triple_dot =False1568# There are three wildcards allowed in p4 views1569# (see "p4 help views"). This code knows how to1570# handle "..." (only at the end), but cannot deal with1571# "%%n" or "*". Only check the depot_side, as p4 should1572# validate that the client_side matches too.1573if re.search(r'%%[1-9]', self.path):1574die("Can't handle%%n wildcards in view:%s"% self.path)1575if self.path.find("*") >=0:1576die("Can't handle * wildcards in view:%s"% self.path)1577 triple_dot_index = self.path.find("...")1578if triple_dot_index >=0:1579if triple_dot_index !=len(self.path) -3:1580die("Can handle only single ... wildcard, at end:%s"%1581 self.path)1582 self.ends_triple_dot =True15831584defensure_compatible(self, other_path):1585"""Make sure the wildcards agree."""1586if self.ends_triple_dot != other_path.ends_triple_dot:1587die("Both paths must end with ... if either does;\n"+1588"paths:%s %s"% (self.path, other_path.path))15891590defmatch_wildcards(self, test_path):1591"""See if this test_path matches us, and fill in the value1592 of the wildcards if so. Returns a tuple of1593 (True|False, wildcards[]). For now, only the ... at end1594 is supported, so at most one wildcard."""1595if self.ends_triple_dot:1596 dotless = self.path[:-3]1597if test_path.startswith(dotless):1598 wildcard = test_path[len(dotless):]1599return(True, [ wildcard ])1600else:1601if test_path == self.path:1602return(True, [])1603return(False, [])16041605defmatch(self, test_path):1606"""Just return if it matches; don't bother with the wildcards."""1607 b, _ = self.match_wildcards(test_path)1608return b16091610deffill_in_wildcards(self, wildcards):1611"""Return the relative path, with the wildcards filled in1612 if there are any."""1613if self.ends_triple_dot:1614return self.path[:-3] + wildcards[0]1615else:1616return self.path16171618classMapping(object):1619def__init__(self, depot_side, client_side, overlay, exclude):1620# depot_side is without the trailing /... if it had one1621 self.depot_side = View.Path(depot_side, is_depot=True)1622 self.client_side = View.Path(client_side, is_depot=False)1623 self.overlay = overlay # started with "+"1624 self.exclude = exclude # started with "-"1625assert not(self.overlay and self.exclude)1626 self.depot_side.ensure_compatible(self.client_side)16271628def__str__(self):1629 c =" "1630if self.overlay:1631 c ="+"1632if self.exclude:1633 c ="-"1634return"View.Mapping:%s%s->%s"% \1635(c, self.depot_side.path, self.client_side.path)16361637defmap_depot_to_client(self, depot_path):1638"""Calculate the client path if using this mapping on the1639 given depot path; does not consider the effect of other1640 mappings in a view. Even excluded mappings are returned."""1641 matches, wildcards = self.depot_side.match_wildcards(depot_path)1642if not matches:1643return""1644 client_path = self.client_side.fill_in_wildcards(wildcards)1645return client_path16461647#1648# View methods1649#1650def__init__(self):1651 self.mappings = []16521653defappend(self, view_line):1654"""Parse a view line, splitting it into depot and client1655 sides. Append to self.mappings, preserving order."""16561657# Split the view line into exactly two words. P4 enforces1658# structure on these lines that simplifies this quite a bit.1659#1660# Either or both words may be double-quoted.1661# Single quotes do not matter.1662# Double-quote marks cannot occur inside the words.1663# A + or - prefix is also inside the quotes.1664# There are no quotes unless they contain a space.1665# The line is already white-space stripped.1666# The two words are separated by a single space.1667#1668if view_line[0] =='"':1669# First word is double quoted. Find its end.1670 close_quote_index = view_line.find('"',1)1671if close_quote_index <=0:1672die("No first-word closing quote found:%s"% view_line)1673 depot_side = view_line[1:close_quote_index]1674# skip closing quote and space1675 rhs_index = close_quote_index +1+11676else:1677 space_index = view_line.find(" ")1678if space_index <=0:1679die("No word-splitting space found:%s"% view_line)1680 depot_side = view_line[0:space_index]1681 rhs_index = space_index +116821683if view_line[rhs_index] =='"':1684# Second word is double quoted. Make sure there is a1685# double quote at the end too.1686if not view_line.endswith('"'):1687die("View line with rhs quote should end with one:%s"%1688 view_line)1689# skip the quotes1690 client_side = view_line[rhs_index+1:-1]1691else:1692 client_side = view_line[rhs_index:]16931694# prefix + means overlay on previous mapping1695 overlay =False1696if depot_side.startswith("+"):1697 overlay =True1698 depot_side = depot_side[1:]16991700# prefix - means exclude this path1701 exclude =False1702if depot_side.startswith("-"):1703 exclude =True1704 depot_side = depot_side[1:]17051706 m = View.Mapping(depot_side, client_side, overlay, exclude)1707 self.mappings.append(m)17081709defmap_in_client(self, depot_path):1710"""Return the relative location in the client where this1711 depot file should live. Returns "" if the file should1712 not be mapped in the client."""17131714 paths_filled = []1715 client_path =""17161717# look at later entries first1718for m in self.mappings[::-1]:17191720# see where will this path end up in the client1721 p = m.map_depot_to_client(depot_path)17221723if p =="":1724# Depot path does not belong in client. Must remember1725# this, as previous items should not cause files to1726# exist in this path either. Remember that the list is1727# being walked from the end, which has higher precedence.1728# Overlap mappings do not exclude previous mappings.1729if not m.overlay:1730 paths_filled.append(m.client_side)17311732else:1733# This mapping matched; no need to search any further.1734# But, the mapping could be rejected if the client path1735# has already been claimed by an earlier mapping (i.e.1736# one later in the list, which we are walking backwards).1737 already_mapped_in_client =False1738for f in paths_filled:1739# this is View.Path.match1740if f.match(p):1741 already_mapped_in_client =True1742break1743if not already_mapped_in_client:1744# Include this file, unless it is from a line that1745# explicitly said to exclude it.1746if not m.exclude:1747 client_path = p17481749# a match, even if rejected, always stops the search1750break17511752return client_path17531754classP4Sync(Command, P4UserMap):1755 delete_actions = ("delete","move/delete","purge")17561757def__init__(self):1758 Command.__init__(self)1759 P4UserMap.__init__(self)1760 self.options = [1761 optparse.make_option("--branch", dest="branch"),1762 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),1763 optparse.make_option("--changesfile", dest="changesFile"),1764 optparse.make_option("--silent", dest="silent", action="store_true"),1765 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),1766 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),1767 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",1768help="Import into refs/heads/ , not refs/remotes"),1769 optparse.make_option("--max-changes", dest="maxChanges"),1770 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',1771help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),1772 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',1773help="Only sync files that are included in the Perforce Client Spec")1774]1775 self.description ="""Imports from Perforce into a git repository.\n1776 example:1777 //depot/my/project/ -- to import the current head1778 //depot/my/project/@all -- to import everything1779 //depot/my/project/@1,6 -- to import only from revision 1 to 617801781 (a ... is not needed in the path p4 specification, it's added implicitly)"""17821783 self.usage +=" //depot/path[@revRange]"1784 self.silent =False1785 self.createdBranches =set()1786 self.committedChanges =set()1787 self.branch =""1788 self.detectBranches =False1789 self.detectLabels =False1790 self.importLabels =False1791 self.changesFile =""1792 self.syncWithOrigin =True1793 self.importIntoRemotes =True1794 self.maxChanges =""1795 self.isWindows = (platform.system() =="Windows")1796 self.keepRepoPath =False1797 self.depotPaths =None1798 self.p4BranchesInGit = []1799 self.cloneExclude = []1800 self.useClientSpec =False1801 self.useClientSpec_from_options =False1802 self.clientSpecDirs =None1803 self.tempBranches = []1804 self.tempBranchLocation ="git-p4-tmp"18051806ifgitConfig("git-p4.syncFromOrigin") =="false":1807 self.syncWithOrigin =False18081809# Force a checkpoint in fast-import and wait for it to finish1810defcheckpoint(self):1811 self.gitStream.write("checkpoint\n\n")1812 self.gitStream.write("progress checkpoint\n\n")1813 out = self.gitOutput.readline()1814if self.verbose:1815print"checkpoint finished: "+ out18161817defextractFilesFromCommit(self, commit):1818 self.cloneExclude = [re.sub(r"\.\.\.$","", path)1819for path in self.cloneExclude]1820 files = []1821 fnum =01822while commit.has_key("depotFile%s"% fnum):1823 path = commit["depotFile%s"% fnum]18241825if[p for p in self.cloneExclude1826ifp4PathStartsWith(path, p)]:1827 found =False1828else:1829 found = [p for p in self.depotPaths1830ifp4PathStartsWith(path, p)]1831if not found:1832 fnum = fnum +11833continue18341835file= {}1836file["path"] = path1837file["rev"] = commit["rev%s"% fnum]1838file["action"] = commit["action%s"% fnum]1839file["type"] = commit["type%s"% fnum]1840 files.append(file)1841 fnum = fnum +11842return files18431844defstripRepoPath(self, path, prefixes):1845if self.useClientSpec:1846return self.clientSpecDirs.map_in_client(path)18471848if self.keepRepoPath:1849 prefixes = [re.sub("^(//[^/]+/).*", r'\1', prefixes[0])]18501851for p in prefixes:1852ifp4PathStartsWith(path, p):1853 path = path[len(p):]18541855return path18561857defsplitFilesIntoBranches(self, commit):1858 branches = {}1859 fnum =01860while commit.has_key("depotFile%s"% fnum):1861 path = commit["depotFile%s"% fnum]1862 found = [p for p in self.depotPaths1863ifp4PathStartsWith(path, p)]1864if not found:1865 fnum = fnum +11866continue18671868file= {}1869file["path"] = path1870file["rev"] = commit["rev%s"% fnum]1871file["action"] = commit["action%s"% fnum]1872file["type"] = commit["type%s"% fnum]1873 fnum = fnum +118741875 relPath = self.stripRepoPath(path, self.depotPaths)1876 relPath =wildcard_decode(relPath)18771878for branch in self.knownBranches.keys():18791880# add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.21881if relPath.startswith(branch +"/"):1882if branch not in branches:1883 branches[branch] = []1884 branches[branch].append(file)1885break18861887return branches18881889# output one file from the P4 stream1890# - helper for streamP4Files18911892defstreamOneP4File(self,file, contents):1893 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)1894 relPath =wildcard_decode(relPath)1895if verbose:1896 sys.stderr.write("%s\n"% relPath)18971898(type_base, type_mods) =split_p4_type(file["type"])18991900 git_mode ="100644"1901if"x"in type_mods:1902 git_mode ="100755"1903if type_base =="symlink":1904 git_mode ="120000"1905# p4 print on a symlink contains "target\n"; remove the newline1906 data =''.join(contents)1907 contents = [data[:-1]]19081909if type_base =="utf16":1910# p4 delivers different text in the python output to -G1911# than it does when using "print -o", or normal p4 client1912# operations. utf16 is converted to ascii or utf8, perhaps.1913# But ascii text saved as -t utf16 is completely mangled.1914# Invoke print -o to get the real contents.1915 text =p4_read_pipe(['print','-q','-o','-',file['depotFile']])1916 contents = [ text ]19171918if type_base =="apple":1919# Apple filetype files will be streamed as a concatenation of1920# its appledouble header and the contents. This is useless1921# on both macs and non-macs. If using "print -q -o xx", it1922# will create "xx" with the data, and "%xx" with the header.1923# This is also not very useful.1924#1925# Ideally, someday, this script can learn how to generate1926# appledouble files directly and import those to git, but1927# non-mac machines can never find a use for apple filetype.1928print"\nIgnoring apple filetype file%s"%file['depotFile']1929return19301931# Perhaps windows wants unicode, utf16 newlines translated too;1932# but this is not doing it.1933if self.isWindows and type_base =="text":1934 mangled = []1935for data in contents:1936 data = data.replace("\r\n","\n")1937 mangled.append(data)1938 contents = mangled19391940# Note that we do not try to de-mangle keywords on utf16 files,1941# even though in theory somebody may want that.1942 pattern =p4_keywords_regexp_for_type(type_base, type_mods)1943if pattern:1944 regexp = re.compile(pattern, re.VERBOSE)1945 text =''.join(contents)1946 text = regexp.sub(r'$\1$', text)1947 contents = [ text ]19481949 self.gitStream.write("M%sinline%s\n"% (git_mode, relPath))19501951# total length...1952 length =01953for d in contents:1954 length = length +len(d)19551956 self.gitStream.write("data%d\n"% length)1957for d in contents:1958 self.gitStream.write(d)1959 self.gitStream.write("\n")19601961defstreamOneP4Deletion(self,file):1962 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)1963 relPath =wildcard_decode(relPath)1964if verbose:1965 sys.stderr.write("delete%s\n"% relPath)1966 self.gitStream.write("D%s\n"% relPath)19671968# handle another chunk of streaming data1969defstreamP4FilesCb(self, marshalled):19701971if marshalled.has_key('depotFile')and self.stream_have_file_info:1972# start of a new file - output the old one first1973 self.streamOneP4File(self.stream_file, self.stream_contents)1974 self.stream_file = {}1975 self.stream_contents = []1976 self.stream_have_file_info =False19771978# pick up the new file information... for the1979# 'data' field we need to append to our array1980for k in marshalled.keys():1981if k =='data':1982 self.stream_contents.append(marshalled['data'])1983else:1984 self.stream_file[k] = marshalled[k]19851986 self.stream_have_file_info =True19871988# Stream directly from "p4 files" into "git fast-import"1989defstreamP4Files(self, files):1990 filesForCommit = []1991 filesToRead = []1992 filesToDelete = []19931994for f in files:1995# if using a client spec, only add the files that have1996# a path in the client1997if self.clientSpecDirs:1998if self.clientSpecDirs.map_in_client(f['path']) =="":1999continue20002001 filesForCommit.append(f)2002if f['action']in self.delete_actions:2003 filesToDelete.append(f)2004else:2005 filesToRead.append(f)20062007# deleted files...2008for f in filesToDelete:2009 self.streamOneP4Deletion(f)20102011iflen(filesToRead) >0:2012 self.stream_file = {}2013 self.stream_contents = []2014 self.stream_have_file_info =False20152016# curry self argument2017defstreamP4FilesCbSelf(entry):2018 self.streamP4FilesCb(entry)20192020 fileArgs = ['%s#%s'% (f['path'], f['rev'])for f in filesToRead]20212022p4CmdList(["-x","-","print"],2023 stdin=fileArgs,2024 cb=streamP4FilesCbSelf)20252026# do the last chunk2027if self.stream_file.has_key('depotFile'):2028 self.streamOneP4File(self.stream_file, self.stream_contents)20292030defmake_email(self, userid):2031if userid in self.users:2032return self.users[userid]2033else:2034return"%s<a@b>"% userid20352036# Stream a p4 tag2037defstreamTag(self, gitStream, labelName, labelDetails, commit, epoch):2038if verbose:2039print"writing tag%sfor commit%s"% (labelName, commit)2040 gitStream.write("tag%s\n"% labelName)2041 gitStream.write("from%s\n"% commit)20422043if labelDetails.has_key('Owner'):2044 owner = labelDetails["Owner"]2045else:2046 owner =None20472048# Try to use the owner of the p4 label, or failing that,2049# the current p4 user id.2050if owner:2051 email = self.make_email(owner)2052else:2053 email = self.make_email(self.p4UserId())2054 tagger ="%s %s %s"% (email, epoch, self.tz)20552056 gitStream.write("tagger%s\n"% tagger)20572058print"labelDetails=",labelDetails2059if labelDetails.has_key('Description'):2060 description = labelDetails['Description']2061else:2062 description ='Label from git p4'20632064 gitStream.write("data%d\n"%len(description))2065 gitStream.write(description)2066 gitStream.write("\n")20672068defcommit(self, details, files, branch, branchPrefixes, parent =""):2069 epoch = details["time"]2070 author = details["user"]2071 self.branchPrefixes = branchPrefixes20722073if self.verbose:2074print"commit into%s"% branch20752076# start with reading files; if that fails, we should not2077# create a commit.2078 new_files = []2079for f in files:2080if[p for p in branchPrefixes ifp4PathStartsWith(f['path'], p)]:2081 new_files.append(f)2082else:2083 sys.stderr.write("Ignoring file outside of prefix:%s\n"% f['path'])20842085 self.gitStream.write("commit%s\n"% branch)2086# gitStream.write("mark :%s\n" % details["change"])2087 self.committedChanges.add(int(details["change"]))2088 committer =""2089if author not in self.users:2090 self.getUserMapFromPerforceServer()2091 committer ="%s %s %s"% (self.make_email(author), epoch, self.tz)20922093 self.gitStream.write("committer%s\n"% committer)20942095 self.gitStream.write("data <<EOT\n")2096 self.gitStream.write(details["desc"])2097 self.gitStream.write("\n[git-p4: depot-paths =\"%s\": change =%s"2098% (','.join(branchPrefixes), details["change"]))2099iflen(details['options']) >0:2100 self.gitStream.write(": options =%s"% details['options'])2101 self.gitStream.write("]\nEOT\n\n")21022103iflen(parent) >0:2104if self.verbose:2105print"parent%s"% parent2106 self.gitStream.write("from%s\n"% parent)21072108 self.streamP4Files(new_files)2109 self.gitStream.write("\n")21102111 change =int(details["change"])21122113if self.labels.has_key(change):2114 label = self.labels[change]2115 labelDetails = label[0]2116 labelRevisions = label[1]2117if self.verbose:2118print"Change%sis labelled%s"% (change, labelDetails)21192120 files =p4CmdList(["files"] + ["%s...@%s"% (p, change)2121for p in branchPrefixes])21222123iflen(files) ==len(labelRevisions):21242125 cleanedFiles = {}2126for info in files:2127if info["action"]in self.delete_actions:2128continue2129 cleanedFiles[info["depotFile"]] = info["rev"]21302131if cleanedFiles == labelRevisions:2132 self.streamTag(self.gitStream,'tag_%s'% labelDetails['label'], labelDetails, branch, epoch)21332134else:2135if not self.silent:2136print("Tag%sdoes not match with change%s: files do not match."2137% (labelDetails["label"], change))21382139else:2140if not self.silent:2141print("Tag%sdoes not match with change%s: file count is different."2142% (labelDetails["label"], change))21432144# Build a dictionary of changelists and labels, for "detect-labels" option.2145defgetLabels(self):2146 self.labels = {}21472148 l =p4CmdList(["labels"] + ["%s..."% p for p in self.depotPaths])2149iflen(l) >0and not self.silent:2150print"Finding files belonging to labels in%s"% `self.depotPaths`21512152for output in l:2153 label = output["label"]2154 revisions = {}2155 newestChange =02156if self.verbose:2157print"Querying files for label%s"% label2158forfileinp4CmdList(["files"] +2159["%s...@%s"% (p, label)2160for p in self.depotPaths]):2161 revisions[file["depotFile"]] =file["rev"]2162 change =int(file["change"])2163if change > newestChange:2164 newestChange = change21652166 self.labels[newestChange] = [output, revisions]21672168if self.verbose:2169print"Label changes:%s"% self.labels.keys()21702171# Import p4 labels as git tags. A direct mapping does not2172# exist, so assume that if all the files are at the same revision2173# then we can use that, or it's something more complicated we should2174# just ignore.2175defimportP4Labels(self, stream, p4Labels):2176if verbose:2177print"import p4 labels: "+' '.join(p4Labels)21782179 ignoredP4Labels =gitConfigList("git-p4.ignoredP4Labels")2180 validLabelRegexp =gitConfig("git-p4.labelImportRegexp")2181iflen(validLabelRegexp) ==0:2182 validLabelRegexp = defaultLabelRegexp2183 m = re.compile(validLabelRegexp)21842185for name in p4Labels:2186 commitFound =False21872188if not m.match(name):2189if verbose:2190print"label%sdoes not match regexp%s"% (name,validLabelRegexp)2191continue21922193if name in ignoredP4Labels:2194continue21952196 labelDetails =p4CmdList(['label',"-o", name])[0]21972198# get the most recent changelist for each file in this label2199 change =p4Cmd(["changes","-m","1"] + ["%s...@%s"% (p, name)2200for p in self.depotPaths])22012202if change.has_key('change'):2203# find the corresponding git commit; take the oldest commit2204 changelist =int(change['change'])2205 gitCommit =read_pipe(["git","rev-list","--max-count=1",2206"--reverse",":/\[git-p4:.*change =%d\]"% changelist])2207iflen(gitCommit) ==0:2208print"could not find git commit for changelist%d"% changelist2209else:2210 gitCommit = gitCommit.strip()2211 commitFound =True2212# Convert from p4 time format2213try:2214 tmwhen = time.strptime(labelDetails['Update'],"%Y/%m/%d%H:%M:%S")2215exceptValueError:2216print"Could not convert label time%s"% labelDetail['Update']2217 tmwhen =122182219 when =int(time.mktime(tmwhen))2220 self.streamTag(stream, name, labelDetails, gitCommit, when)2221if verbose:2222print"p4 label%smapped to git commit%s"% (name, gitCommit)2223else:2224if verbose:2225print"Label%shas no changelists - possibly deleted?"% name22262227if not commitFound:2228# We can't import this label; don't try again as it will get very2229# expensive repeatedly fetching all the files for labels that will2230# never be imported. If the label is moved in the future, the2231# ignore will need to be removed manually.2232system(["git","config","--add","git-p4.ignoredP4Labels", name])22332234defguessProjectName(self):2235for p in self.depotPaths:2236if p.endswith("/"):2237 p = p[:-1]2238 p = p[p.strip().rfind("/") +1:]2239if not p.endswith("/"):2240 p +="/"2241return p22422243defgetBranchMapping(self):2244 lostAndFoundBranches =set()22452246 user =gitConfig("git-p4.branchUser")2247iflen(user) >0:2248 command ="branches -u%s"% user2249else:2250 command ="branches"22512252for info inp4CmdList(command):2253 details =p4Cmd(["branch","-o", info["branch"]])2254 viewIdx =02255while details.has_key("View%s"% viewIdx):2256 paths = details["View%s"% viewIdx].split(" ")2257 viewIdx = viewIdx +12258# require standard //depot/foo/... //depot/bar/... mapping2259iflen(paths) !=2or not paths[0].endswith("/...")or not paths[1].endswith("/..."):2260continue2261 source = paths[0]2262 destination = paths[1]2263## HACK2264ifp4PathStartsWith(source, self.depotPaths[0])andp4PathStartsWith(destination, self.depotPaths[0]):2265 source = source[len(self.depotPaths[0]):-4]2266 destination = destination[len(self.depotPaths[0]):-4]22672268if destination in self.knownBranches:2269if not self.silent:2270print"p4 branch%sdefines a mapping from%sto%s"% (info["branch"], source, destination)2271print"but there exists another mapping from%sto%salready!"% (self.knownBranches[destination], destination)2272continue22732274 self.knownBranches[destination] = source22752276 lostAndFoundBranches.discard(destination)22772278if source not in self.knownBranches:2279 lostAndFoundBranches.add(source)22802281# Perforce does not strictly require branches to be defined, so we also2282# check git config for a branch list.2283#2284# Example of branch definition in git config file:2285# [git-p4]2286# branchList=main:branchA2287# branchList=main:branchB2288# branchList=branchA:branchC2289 configBranches =gitConfigList("git-p4.branchList")2290for branch in configBranches:2291if branch:2292(source, destination) = branch.split(":")2293 self.knownBranches[destination] = source22942295 lostAndFoundBranches.discard(destination)22962297if source not in self.knownBranches:2298 lostAndFoundBranches.add(source)229923002301for branch in lostAndFoundBranches:2302 self.knownBranches[branch] = branch23032304defgetBranchMappingFromGitBranches(self):2305 branches =p4BranchesInGit(self.importIntoRemotes)2306for branch in branches.keys():2307if branch =="master":2308 branch ="main"2309else:2310 branch = branch[len(self.projectName):]2311 self.knownBranches[branch] = branch23122313deflistExistingP4GitBranches(self):2314# branches holds mapping from name to commit2315 branches =p4BranchesInGit(self.importIntoRemotes)2316 self.p4BranchesInGit = branches.keys()2317for branch in branches.keys():2318 self.initialParents[self.refPrefix + branch] = branches[branch]23192320defupdateOptionDict(self, d):2321 option_keys = {}2322if self.keepRepoPath:2323 option_keys['keepRepoPath'] =123242325 d["options"] =' '.join(sorted(option_keys.keys()))23262327defreadOptions(self, d):2328 self.keepRepoPath = (d.has_key('options')2329and('keepRepoPath'in d['options']))23302331defgitRefForBranch(self, branch):2332if branch =="main":2333return self.refPrefix +"master"23342335iflen(branch) <=0:2336return branch23372338return self.refPrefix + self.projectName + branch23392340defgitCommitByP4Change(self, ref, change):2341if self.verbose:2342print"looking in ref "+ ref +" for change%susing bisect..."% change23432344 earliestCommit =""2345 latestCommit =parseRevision(ref)23462347while True:2348if self.verbose:2349print"trying: earliest%slatest%s"% (earliestCommit, latestCommit)2350 next =read_pipe("git rev-list --bisect%s %s"% (latestCommit, earliestCommit)).strip()2351iflen(next) ==0:2352if self.verbose:2353print"argh"2354return""2355 log =extractLogMessageFromGitCommit(next)2356 settings =extractSettingsGitLog(log)2357 currentChange =int(settings['change'])2358if self.verbose:2359print"current change%s"% currentChange23602361if currentChange == change:2362if self.verbose:2363print"found%s"% next2364return next23652366if currentChange < change:2367 earliestCommit ="^%s"% next2368else:2369 latestCommit ="%s"% next23702371return""23722373defimportNewBranch(self, branch, maxChange):2374# make fast-import flush all changes to disk and update the refs using the checkpoint2375# command so that we can try to find the branch parent in the git history2376 self.gitStream.write("checkpoint\n\n");2377 self.gitStream.flush();2378 branchPrefix = self.depotPaths[0] + branch +"/"2379range="@1,%s"% maxChange2380#print "prefix" + branchPrefix2381 changes =p4ChangesForPaths([branchPrefix],range)2382iflen(changes) <=0:2383return False2384 firstChange = changes[0]2385#print "first change in branch: %s" % firstChange2386 sourceBranch = self.knownBranches[branch]2387 sourceDepotPath = self.depotPaths[0] + sourceBranch2388 sourceRef = self.gitRefForBranch(sourceBranch)2389#print "source " + sourceBranch23902391 branchParentChange =int(p4Cmd(["changes","-m","1","%s...@1,%s"% (sourceDepotPath, firstChange)])["change"])2392#print "branch parent: %s" % branchParentChange2393 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)2394iflen(gitParent) >0:2395 self.initialParents[self.gitRefForBranch(branch)] = gitParent2396#print "parent git commit: %s" % gitParent23972398 self.importChanges(changes)2399return True24002401defsearchParent(self, parent, branch, target):2402 parentFound =False2403for blob inread_pipe_lines(["git","rev-list","--reverse","--no-merges", parent]):2404 blob = blob.strip()2405iflen(read_pipe(["git","diff-tree", blob, target])) ==0:2406 parentFound =True2407if self.verbose:2408print"Found parent of%sin commit%s"% (branch, blob)2409break2410if parentFound:2411return blob2412else:2413return None24142415defimportChanges(self, changes):2416 cnt =12417for change in changes:2418 description =p4Cmd(["describe",str(change)])2419 self.updateOptionDict(description)24202421if not self.silent:2422 sys.stdout.write("\rImporting revision%s(%s%%)"% (change, cnt *100/len(changes)))2423 sys.stdout.flush()2424 cnt = cnt +124252426try:2427if self.detectBranches:2428 branches = self.splitFilesIntoBranches(description)2429for branch in branches.keys():2430## HACK --hwn2431 branchPrefix = self.depotPaths[0] + branch +"/"24322433 parent =""24342435 filesForCommit = branches[branch]24362437if self.verbose:2438print"branch is%s"% branch24392440 self.updatedBranches.add(branch)24412442if branch not in self.createdBranches:2443 self.createdBranches.add(branch)2444 parent = self.knownBranches[branch]2445if parent == branch:2446 parent =""2447else:2448 fullBranch = self.projectName + branch2449if fullBranch not in self.p4BranchesInGit:2450if not self.silent:2451print("\nImporting new branch%s"% fullBranch);2452if self.importNewBranch(branch, change -1):2453 parent =""2454 self.p4BranchesInGit.append(fullBranch)2455if not self.silent:2456print("\nResuming with change%s"% change);24572458if self.verbose:2459print"parent determined through known branches:%s"% parent24602461 branch = self.gitRefForBranch(branch)2462 parent = self.gitRefForBranch(parent)24632464if self.verbose:2465print"looking for initial parent for%s; current parent is%s"% (branch, parent)24662467iflen(parent) ==0and branch in self.initialParents:2468 parent = self.initialParents[branch]2469del self.initialParents[branch]24702471 blob =None2472iflen(parent) >0:2473 tempBranch = os.path.join(self.tempBranchLocation,"%d"% (change))2474if self.verbose:2475print"Creating temporary branch: "+ tempBranch2476 self.commit(description, filesForCommit, tempBranch, [branchPrefix])2477 self.tempBranches.append(tempBranch)2478 self.checkpoint()2479 blob = self.searchParent(parent, branch, tempBranch)2480if blob:2481 self.commit(description, filesForCommit, branch, [branchPrefix], blob)2482else:2483if self.verbose:2484print"Parent of%snot found. Committing into head of%s"% (branch, parent)2485 self.commit(description, filesForCommit, branch, [branchPrefix], parent)2486else:2487 files = self.extractFilesFromCommit(description)2488 self.commit(description, files, self.branch, self.depotPaths,2489 self.initialParent)2490 self.initialParent =""2491exceptIOError:2492print self.gitError.read()2493 sys.exit(1)24942495defimportHeadRevision(self, revision):2496print"Doing initial import of%sfrom revision%sinto%s"% (' '.join(self.depotPaths), revision, self.branch)24972498 details = {}2499 details["user"] ="git perforce import user"2500 details["desc"] = ("Initial import of%sfrom the state at revision%s\n"2501% (' '.join(self.depotPaths), revision))2502 details["change"] = revision2503 newestRevision =025042505 fileCnt =02506 fileArgs = ["%s...%s"% (p,revision)for p in self.depotPaths]25072508for info inp4CmdList(["files"] + fileArgs):25092510if'code'in info and info['code'] =='error':2511 sys.stderr.write("p4 returned an error:%s\n"2512% info['data'])2513if info['data'].find("must refer to client") >=0:2514 sys.stderr.write("This particular p4 error is misleading.\n")2515 sys.stderr.write("Perhaps the depot path was misspelled.\n");2516 sys.stderr.write("Depot path:%s\n"%" ".join(self.depotPaths))2517 sys.exit(1)2518if'p4ExitCode'in info:2519 sys.stderr.write("p4 exitcode:%s\n"% info['p4ExitCode'])2520 sys.exit(1)252125222523 change =int(info["change"])2524if change > newestRevision:2525 newestRevision = change25262527if info["action"]in self.delete_actions:2528# don't increase the file cnt, otherwise details["depotFile123"] will have gaps!2529#fileCnt = fileCnt + 12530continue25312532for prop in["depotFile","rev","action","type"]:2533 details["%s%s"% (prop, fileCnt)] = info[prop]25342535 fileCnt = fileCnt +125362537 details["change"] = newestRevision25382539# Use time from top-most change so that all git p4 clones of2540# the same p4 repo have the same commit SHA1s.2541 res =p4CmdList("describe -s%d"% newestRevision)2542 newestTime =None2543for r in res:2544if r.has_key('time'):2545 newestTime =int(r['time'])2546if newestTime is None:2547die("\"describe -s\"on newest change%ddid not give a time")2548 details["time"] = newestTime25492550 self.updateOptionDict(details)2551try:2552 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPaths)2553exceptIOError:2554print"IO error with git fast-import. Is your git version recent enough?"2555print self.gitError.read()255625572558defrun(self, args):2559 self.depotPaths = []2560 self.changeRange =""2561 self.initialParent =""2562 self.previousDepotPaths = []25632564# map from branch depot path to parent branch2565 self.knownBranches = {}2566 self.initialParents = {}2567 self.hasOrigin =originP4BranchesExist()2568if not self.syncWithOrigin:2569 self.hasOrigin =False25702571if self.importIntoRemotes:2572 self.refPrefix ="refs/remotes/p4/"2573else:2574 self.refPrefix ="refs/heads/p4/"25752576if self.syncWithOrigin and self.hasOrigin:2577if not self.silent:2578print"Syncing with origin first by calling git fetch origin"2579system("git fetch origin")25802581iflen(self.branch) ==0:2582 self.branch = self.refPrefix +"master"2583ifgitBranchExists("refs/heads/p4")and self.importIntoRemotes:2584system("git update-ref%srefs/heads/p4"% self.branch)2585system("git branch -D p4");2586# create it /after/ importing, when master exists2587if notgitBranchExists(self.refPrefix +"HEAD")and self.importIntoRemotes andgitBranchExists(self.branch):2588system("git symbolic-ref%sHEAD%s"% (self.refPrefix, self.branch))25892590# accept either the command-line option, or the configuration variable2591if self.useClientSpec:2592# will use this after clone to set the variable2593 self.useClientSpec_from_options =True2594else:2595ifgitConfig("git-p4.useclientspec","--bool") =="true":2596 self.useClientSpec =True2597if self.useClientSpec:2598 self.clientSpecDirs =getClientSpec()25992600# TODO: should always look at previous commits,2601# merge with previous imports, if possible.2602if args == []:2603if self.hasOrigin:2604createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)2605 self.listExistingP4GitBranches()26062607iflen(self.p4BranchesInGit) >1:2608if not self.silent:2609print"Importing from/into multiple branches"2610 self.detectBranches =True26112612if self.verbose:2613print"branches:%s"% self.p4BranchesInGit26142615 p4Change =02616for branch in self.p4BranchesInGit:2617 logMsg =extractLogMessageFromGitCommit(self.refPrefix + branch)26182619 settings =extractSettingsGitLog(logMsg)26202621 self.readOptions(settings)2622if(settings.has_key('depot-paths')2623and settings.has_key('change')):2624 change =int(settings['change']) +12625 p4Change =max(p4Change, change)26262627 depotPaths =sorted(settings['depot-paths'])2628if self.previousDepotPaths == []:2629 self.previousDepotPaths = depotPaths2630else:2631 paths = []2632for(prev, cur)inzip(self.previousDepotPaths, depotPaths):2633 prev_list = prev.split("/")2634 cur_list = cur.split("/")2635for i inrange(0,min(len(cur_list),len(prev_list))):2636if cur_list[i] <> prev_list[i]:2637 i = i -12638break26392640 paths.append("/".join(cur_list[:i +1]))26412642 self.previousDepotPaths = paths26432644if p4Change >0:2645 self.depotPaths =sorted(self.previousDepotPaths)2646 self.changeRange ="@%s,#head"% p4Change2647if not self.detectBranches:2648 self.initialParent =parseRevision(self.branch)2649if not self.silent and not self.detectBranches:2650print"Performing incremental import into%sgit branch"% self.branch26512652if not self.branch.startswith("refs/"):2653 self.branch ="refs/heads/"+ self.branch26542655iflen(args) ==0and self.depotPaths:2656if not self.silent:2657print"Depot paths:%s"%' '.join(self.depotPaths)2658else:2659if self.depotPaths and self.depotPaths != args:2660print("previous import used depot path%sand now%swas specified. "2661"This doesn't work!"% (' '.join(self.depotPaths),2662' '.join(args)))2663 sys.exit(1)26642665 self.depotPaths =sorted(args)26662667 revision =""2668 self.users = {}26692670# Make sure no revision specifiers are used when --changesfile2671# is specified.2672 bad_changesfile =False2673iflen(self.changesFile) >0:2674for p in self.depotPaths:2675if p.find("@") >=0or p.find("#") >=0:2676 bad_changesfile =True2677break2678if bad_changesfile:2679die("Option --changesfile is incompatible with revision specifiers")26802681 newPaths = []2682for p in self.depotPaths:2683if p.find("@") != -1:2684 atIdx = p.index("@")2685 self.changeRange = p[atIdx:]2686if self.changeRange =="@all":2687 self.changeRange =""2688elif','not in self.changeRange:2689 revision = self.changeRange2690 self.changeRange =""2691 p = p[:atIdx]2692elif p.find("#") != -1:2693 hashIdx = p.index("#")2694 revision = p[hashIdx:]2695 p = p[:hashIdx]2696elif self.previousDepotPaths == []:2697# pay attention to changesfile, if given, else import2698# the entire p4 tree at the head revision2699iflen(self.changesFile) ==0:2700 revision ="#head"27012702 p = re.sub("\.\.\.$","", p)2703if not p.endswith("/"):2704 p +="/"27052706 newPaths.append(p)27072708 self.depotPaths = newPaths27092710 self.loadUserMapFromCache()2711 self.labels = {}2712if self.detectLabels:2713 self.getLabels();27142715if self.detectBranches:2716## FIXME - what's a P4 projectName ?2717 self.projectName = self.guessProjectName()27182719if self.hasOrigin:2720 self.getBranchMappingFromGitBranches()2721else:2722 self.getBranchMapping()2723if self.verbose:2724print"p4-git branches:%s"% self.p4BranchesInGit2725print"initial parents:%s"% self.initialParents2726for b in self.p4BranchesInGit:2727if b !="master":27282729## FIXME2730 b = b[len(self.projectName):]2731 self.createdBranches.add(b)27322733 self.tz ="%+03d%02d"% (- time.timezone /3600, ((- time.timezone %3600) /60))27342735 importProcess = subprocess.Popen(["git","fast-import"],2736 stdin=subprocess.PIPE, stdout=subprocess.PIPE,2737 stderr=subprocess.PIPE);2738 self.gitOutput = importProcess.stdout2739 self.gitStream = importProcess.stdin2740 self.gitError = importProcess.stderr27412742if revision:2743 self.importHeadRevision(revision)2744else:2745 changes = []27462747iflen(self.changesFile) >0:2748 output =open(self.changesFile).readlines()2749 changeSet =set()2750for line in output:2751 changeSet.add(int(line))27522753for change in changeSet:2754 changes.append(change)27552756 changes.sort()2757else:2758# catch "git p4 sync" with no new branches, in a repo that2759# does not have any existing p4 branches2760iflen(args) ==0and not self.p4BranchesInGit:2761die("No remote p4 branches. Perhaps you never did\"git p4 clone\"in here.");2762if self.verbose:2763print"Getting p4 changes for%s...%s"% (', '.join(self.depotPaths),2764 self.changeRange)2765 changes =p4ChangesForPaths(self.depotPaths, self.changeRange)27662767iflen(self.maxChanges) >0:2768 changes = changes[:min(int(self.maxChanges),len(changes))]27692770iflen(changes) ==0:2771if not self.silent:2772print"No changes to import!"2773else:2774if not self.silent and not self.detectBranches:2775print"Import destination:%s"% self.branch27762777 self.updatedBranches =set()27782779 self.importChanges(changes)27802781if not self.silent:2782print""2783iflen(self.updatedBranches) >0:2784 sys.stdout.write("Updated branches: ")2785for b in self.updatedBranches:2786 sys.stdout.write("%s"% b)2787 sys.stdout.write("\n")27882789ifgitConfig("git-p4.importLabels","--bool") =="true":2790 self.importLabels =True27912792if self.importLabels:2793 p4Labels =getP4Labels(self.depotPaths)2794 gitTags =getGitTags()27952796 missingP4Labels = p4Labels - gitTags2797 self.importP4Labels(self.gitStream, missingP4Labels)27982799 self.gitStream.close()2800if importProcess.wait() !=0:2801die("fast-import failed:%s"% self.gitError.read())2802 self.gitOutput.close()2803 self.gitError.close()28042805# Cleanup temporary branches created during import2806if self.tempBranches != []:2807for branch in self.tempBranches:2808read_pipe("git update-ref -d%s"% branch)2809 os.rmdir(os.path.join(os.environ.get("GIT_DIR",".git"), self.tempBranchLocation))28102811return True28122813classP4Rebase(Command):2814def__init__(self):2815 Command.__init__(self)2816 self.options = [2817 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),2818]2819 self.importLabels =False2820 self.description = ("Fetches the latest revision from perforce and "2821+"rebases the current work (branch) against it")28222823defrun(self, args):2824 sync =P4Sync()2825 sync.importLabels = self.importLabels2826 sync.run([])28272828return self.rebase()28292830defrebase(self):2831if os.system("git update-index --refresh") !=0:2832die("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.");2833iflen(read_pipe("git diff-index HEAD --")) >0:2834die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash.");28352836[upstream, settings] =findUpstreamBranchPoint()2837iflen(upstream) ==0:2838die("Cannot find upstream branchpoint for rebase")28392840# the branchpoint may be p4/foo~3, so strip off the parent2841 upstream = re.sub("~[0-9]+$","", upstream)28422843print"Rebasing the current branch onto%s"% upstream2844 oldHead =read_pipe("git rev-parse HEAD").strip()2845system("git rebase%s"% upstream)2846system("git diff-tree --stat --summary -M%sHEAD"% oldHead)2847return True28482849classP4Clone(P4Sync):2850def__init__(self):2851 P4Sync.__init__(self)2852 self.description ="Creates a new git repository and imports from Perforce into it"2853 self.usage ="usage: %prog [options] //depot/path[@revRange]"2854 self.options += [2855 optparse.make_option("--destination", dest="cloneDestination",2856 action='store', default=None,2857help="where to leave result of the clone"),2858 optparse.make_option("-/", dest="cloneExclude",2859 action="append",type="string",2860help="exclude depot path"),2861 optparse.make_option("--bare", dest="cloneBare",2862 action="store_true", default=False),2863]2864 self.cloneDestination =None2865 self.needsGit =False2866 self.cloneBare =False28672868# This is required for the "append" cloneExclude action2869defensure_value(self, attr, value):2870if nothasattr(self, attr)orgetattr(self, attr)is None:2871setattr(self, attr, value)2872returngetattr(self, attr)28732874defdefaultDestination(self, args):2875## TODO: use common prefix of args?2876 depotPath = args[0]2877 depotDir = re.sub("(@[^@]*)$","", depotPath)2878 depotDir = re.sub("(#[^#]*)$","", depotDir)2879 depotDir = re.sub(r"\.\.\.$","", depotDir)2880 depotDir = re.sub(r"/$","", depotDir)2881return os.path.split(depotDir)[1]28822883defrun(self, args):2884iflen(args) <1:2885return False28862887if self.keepRepoPath and not self.cloneDestination:2888 sys.stderr.write("Must specify destination for --keep-path\n")2889 sys.exit(1)28902891 depotPaths = args28922893if not self.cloneDestination andlen(depotPaths) >1:2894 self.cloneDestination = depotPaths[-1]2895 depotPaths = depotPaths[:-1]28962897 self.cloneExclude = ["/"+p for p in self.cloneExclude]2898for p in depotPaths:2899if not p.startswith("//"):2900return False29012902if not self.cloneDestination:2903 self.cloneDestination = self.defaultDestination(args)29042905print"Importing from%sinto%s"% (', '.join(depotPaths), self.cloneDestination)29062907if not os.path.exists(self.cloneDestination):2908 os.makedirs(self.cloneDestination)2909chdir(self.cloneDestination)29102911 init_cmd = ["git","init"]2912if self.cloneBare:2913 init_cmd.append("--bare")2914 subprocess.check_call(init_cmd)29152916if not P4Sync.run(self, depotPaths):2917return False2918if self.branch !="master":2919if self.importIntoRemotes:2920 masterbranch ="refs/remotes/p4/master"2921else:2922 masterbranch ="refs/heads/p4/master"2923ifgitBranchExists(masterbranch):2924system("git branch master%s"% masterbranch)2925if not self.cloneBare:2926system("git checkout -f")2927else:2928print"Could not detect main branch. No checkout/master branch created."29292930# auto-set this variable if invoked with --use-client-spec2931if self.useClientSpec_from_options:2932system("git config --bool git-p4.useclientspec true")29332934return True29352936classP4Branches(Command):2937def__init__(self):2938 Command.__init__(self)2939 self.options = [ ]2940 self.description = ("Shows the git branches that hold imports and their "2941+"corresponding perforce depot paths")2942 self.verbose =False29432944defrun(self, args):2945iforiginP4BranchesExist():2946createOrUpdateBranchesFromOrigin()29472948 cmdline ="git rev-parse --symbolic "2949 cmdline +=" --remotes"29502951for line inread_pipe_lines(cmdline):2952 line = line.strip()29532954if not line.startswith('p4/')or line =="p4/HEAD":2955continue2956 branch = line29572958 log =extractLogMessageFromGitCommit("refs/remotes/%s"% branch)2959 settings =extractSettingsGitLog(log)29602961print"%s<=%s(%s)"% (branch,",".join(settings["depot-paths"]), settings["change"])2962return True29632964classHelpFormatter(optparse.IndentedHelpFormatter):2965def__init__(self):2966 optparse.IndentedHelpFormatter.__init__(self)29672968defformat_description(self, description):2969if description:2970return description +"\n"2971else:2972return""29732974defprintUsage(commands):2975print"usage:%s<command> [options]"% sys.argv[0]2976print""2977print"valid commands:%s"%", ".join(commands)2978print""2979print"Try%s<command> --help for command specific help."% sys.argv[0]2980print""29812982commands = {2983"debug": P4Debug,2984"submit": P4Submit,2985"commit": P4Submit,2986"sync": P4Sync,2987"rebase": P4Rebase,2988"clone": P4Clone,2989"rollback": P4RollBack,2990"branches": P4Branches2991}299229932994defmain():2995iflen(sys.argv[1:]) ==0:2996printUsage(commands.keys())2997 sys.exit(2)29982999 cmd =""3000 cmdName = sys.argv[1]3001try:3002 klass = commands[cmdName]3003 cmd =klass()3004exceptKeyError:3005print"unknown command%s"% cmdName3006print""3007printUsage(commands.keys())3008 sys.exit(2)30093010 options = cmd.options3011 cmd.gitdir = os.environ.get("GIT_DIR",None)30123013 args = sys.argv[2:]30143015 options.append(optparse.make_option("--verbose", dest="verbose", action="store_true"))3016if cmd.needsGit:3017 options.append(optparse.make_option("--git-dir", dest="gitdir"))30183019 parser = optparse.OptionParser(cmd.usage.replace("%prog","%prog "+ cmdName),3020 options,3021 description = cmd.description,3022 formatter =HelpFormatter())30233024(cmd, args) = parser.parse_args(sys.argv[2:], cmd);3025global verbose3026 verbose = cmd.verbose3027if cmd.needsGit:3028if cmd.gitdir ==None:3029 cmd.gitdir = os.path.abspath(".git")3030if notisValidGitDir(cmd.gitdir):3031 cmd.gitdir =read_pipe("git rev-parse --git-dir").strip()3032if os.path.exists(cmd.gitdir):3033 cdup =read_pipe("git rev-parse --show-cdup").strip()3034iflen(cdup) >0:3035chdir(cdup);30363037if notisValidGitDir(cmd.gitdir):3038ifisValidGitDir(cmd.gitdir +"/.git"):3039 cmd.gitdir +="/.git"3040else:3041die("fatal: cannot locate git repository at%s"% cmd.gitdir)30423043 os.environ["GIT_DIR"] = cmd.gitdir30443045if not cmd.run(args):3046 parser.print_help()3047 sys.exit(2)304830493050if __name__ =='__main__':3051main()