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 optparse.make_option("--dry-run","-n", dest="dry_run", action="store_true"), 857] 858 self.description ="Submit changes from git to the perforce depot." 859 self.usage +=" [name of git branch to submit into perforce depot]" 860 self.origin ="" 861 self.detectRenames =False 862 self.preserveUser =gitConfig("git-p4.preserveUser").lower() =="true" 863 self.dry_run =False 864 self.isWindows = (platform.system() =="Windows") 865 self.exportLabels =False 866 self.p4HasMoveCommand =p4_has_command("move") 867 868defcheck(self): 869iflen(p4CmdList("opened ...")) >0: 870die("You have files opened with perforce! Close them before starting the sync.") 871 872defseparate_jobs_from_description(self, message): 873"""Extract and return a possible Jobs field in the commit 874 message. It goes into a separate section in the p4 change 875 specification. 876 877 A jobs line starts with "Jobs:" and looks like a new field 878 in a form. Values are white-space separated on the same 879 line or on following lines that start with a tab. 880 881 This does not parse and extract the full git commit message 882 like a p4 form. It just sees the Jobs: line as a marker 883 to pass everything from then on directly into the p4 form, 884 but outside the description section. 885 886 Return a tuple (stripped log message, jobs string).""" 887 888 m = re.search(r'^Jobs:', message, re.MULTILINE) 889if m is None: 890return(message,None) 891 892 jobtext = message[m.start():] 893 stripped_message = message[:m.start()].rstrip() 894return(stripped_message, jobtext) 895 896defprepareLogMessage(self, template, message, jobs): 897"""Edits the template returned from "p4 change -o" to insert 898 the message in the Description field, and the jobs text in 899 the Jobs field.""" 900 result ="" 901 902 inDescriptionSection =False 903 904for line in template.split("\n"): 905if line.startswith("#"): 906 result += line +"\n" 907continue 908 909if inDescriptionSection: 910if line.startswith("Files:")or line.startswith("Jobs:"): 911 inDescriptionSection =False 912# insert Jobs section 913if jobs: 914 result += jobs +"\n" 915else: 916continue 917else: 918if line.startswith("Description:"): 919 inDescriptionSection =True 920 line +="\n" 921for messageLine in message.split("\n"): 922 line +="\t"+ messageLine +"\n" 923 924 result += line +"\n" 925 926return result 927 928defpatchRCSKeywords(self,file, pattern): 929# Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern 930(handle, outFileName) = tempfile.mkstemp(dir='.') 931try: 932 outFile = os.fdopen(handle,"w+") 933 inFile =open(file,"r") 934 regexp = re.compile(pattern, re.VERBOSE) 935for line in inFile.readlines(): 936 line = regexp.sub(r'$\1$', line) 937 outFile.write(line) 938 inFile.close() 939 outFile.close() 940# Forcibly overwrite the original file 941 os.unlink(file) 942 shutil.move(outFileName,file) 943except: 944# cleanup our temporary file 945 os.unlink(outFileName) 946print"Failed to strip RCS keywords in%s"%file 947raise 948 949print"Patched up RCS keywords in%s"%file 950 951defp4UserForCommit(self,id): 952# Return the tuple (perforce user,git email) for a given git commit id 953 self.getUserMapFromPerforceServer() 954 gitEmail =read_pipe("git log --max-count=1 --format='%%ae'%s"%id) 955 gitEmail = gitEmail.strip() 956if not self.emails.has_key(gitEmail): 957return(None,gitEmail) 958else: 959return(self.emails[gitEmail],gitEmail) 960 961defcheckValidP4Users(self,commits): 962# check if any git authors cannot be mapped to p4 users 963foridin commits: 964(user,email) = self.p4UserForCommit(id) 965if not user: 966 msg ="Cannot find p4 user for email%sin commit%s."% (email,id) 967ifgitConfig('git-p4.allowMissingP4Users').lower() =="true": 968print"%s"% msg 969else: 970die("Error:%s\nSet git-p4.allowMissingP4Users to true to allow this."% msg) 971 972deflastP4Changelist(self): 973# Get back the last changelist number submitted in this client spec. This 974# then gets used to patch up the username in the change. If the same 975# client spec is being used by multiple processes then this might go 976# wrong. 977 results =p4CmdList("client -o")# find the current client 978 client =None 979for r in results: 980if r.has_key('Client'): 981 client = r['Client'] 982break 983if not client: 984die("could not get client spec") 985 results =p4CmdList(["changes","-c", client,"-m","1"]) 986for r in results: 987if r.has_key('change'): 988return r['change'] 989die("Could not get changelist number for last submit - cannot patch up user details") 990 991defmodifyChangelistUser(self, changelist, newUser): 992# fixup the user field of a changelist after it has been submitted. 993 changes =p4CmdList("change -o%s"% changelist) 994iflen(changes) !=1: 995die("Bad output from p4 change modifying%sto user%s"% 996(changelist, newUser)) 997 998 c = changes[0] 999if c['User'] == newUser:return# nothing to do1000 c['User'] = newUser1001input= marshal.dumps(c)10021003 result =p4CmdList("change -f -i", stdin=input)1004for r in result:1005if r.has_key('code'):1006if r['code'] =='error':1007die("Could not modify user field of changelist%sto%s:%s"% (changelist, newUser, r['data']))1008if r.has_key('data'):1009print("Updated user field for changelist%sto%s"% (changelist, newUser))1010return1011die("Could not modify user field of changelist%sto%s"% (changelist, newUser))10121013defcanChangeChangelists(self):1014# check to see if we have p4 admin or super-user permissions, either of1015# which are required to modify changelists.1016 results =p4CmdList(["protects", self.depotPath])1017for r in results:1018if r.has_key('perm'):1019if r['perm'] =='admin':1020return11021if r['perm'] =='super':1022return11023return010241025defprepareSubmitTemplate(self):1026"""Run "p4 change -o" to grab a change specification template.1027 This does not use "p4 -G", as it is nice to keep the submission1028 template in original order, since a human might edit it.10291030 Remove lines in the Files section that show changes to files1031 outside the depot path we're committing into."""10321033 template =""1034 inFilesSection =False1035for line inp4_read_pipe_lines(['change','-o']):1036if line.endswith("\r\n"):1037 line = line[:-2] +"\n"1038if inFilesSection:1039if line.startswith("\t"):1040# path starts and ends with a tab1041 path = line[1:]1042 lastTab = path.rfind("\t")1043if lastTab != -1:1044 path = path[:lastTab]1045if notp4PathStartsWith(path, self.depotPath):1046continue1047else:1048 inFilesSection =False1049else:1050if line.startswith("Files:"):1051 inFilesSection =True10521053 template += line10541055return template10561057defedit_template(self, template_file):1058"""Invoke the editor to let the user change the submission1059 message. Return true if okay to continue with the submit."""10601061# if configured to skip the editing part, just submit1062ifgitConfig("git-p4.skipSubmitEdit") =="true":1063return True10641065# look at the modification time, to check later if the user saved1066# the file1067 mtime = os.stat(template_file).st_mtime10681069# invoke the editor1070if os.environ.has_key("P4EDITOR")and(os.environ.get("P4EDITOR") !=""):1071 editor = os.environ.get("P4EDITOR")1072else:1073 editor =read_pipe("git var GIT_EDITOR").strip()1074system(editor +" "+ template_file)10751076# If the file was not saved, prompt to see if this patch should1077# be skipped. But skip this verification step if configured so.1078ifgitConfig("git-p4.skipSubmitEditCheck") =="true":1079return True10801081# modification time updated means user saved the file1082if os.stat(template_file).st_mtime > mtime:1083return True10841085while True:1086 response =raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")1087if response =='y':1088return True1089if response =='n':1090return False10911092defapplyCommit(self,id):1093"""Apply one commit, return True if it succeeded."""10941095print"Applying",read_pipe(["git","show","-s",1096"--format=format:%h%s",id])10971098(p4User, gitEmail) = self.p4UserForCommit(id)10991100 diff =read_pipe_lines("git diff-tree -r%s\"%s^\" \"%s\""% (self.diffOpts,id,id))1101 filesToAdd =set()1102 filesToDelete =set()1103 editedFiles =set()1104 pureRenameCopy =set()1105 filesToChangeExecBit = {}11061107for line in diff:1108 diff =parseDiffTreeEntry(line)1109 modifier = diff['status']1110 path = diff['src']1111if modifier =="M":1112p4_edit(path)1113ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1114 filesToChangeExecBit[path] = diff['dst_mode']1115 editedFiles.add(path)1116elif modifier =="A":1117 filesToAdd.add(path)1118 filesToChangeExecBit[path] = diff['dst_mode']1119if path in filesToDelete:1120 filesToDelete.remove(path)1121elif modifier =="D":1122 filesToDelete.add(path)1123if path in filesToAdd:1124 filesToAdd.remove(path)1125elif modifier =="C":1126 src, dest = diff['src'], diff['dst']1127p4_integrate(src, dest)1128 pureRenameCopy.add(dest)1129if diff['src_sha1'] != diff['dst_sha1']:1130p4_edit(dest)1131 pureRenameCopy.discard(dest)1132ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1133p4_edit(dest)1134 pureRenameCopy.discard(dest)1135 filesToChangeExecBit[dest] = diff['dst_mode']1136 os.unlink(dest)1137 editedFiles.add(dest)1138elif modifier =="R":1139 src, dest = diff['src'], diff['dst']1140if self.p4HasMoveCommand:1141p4_edit(src)# src must be open before move1142p4_move(src, dest)# opens for (move/delete, move/add)1143else:1144p4_integrate(src, dest)1145if diff['src_sha1'] != diff['dst_sha1']:1146p4_edit(dest)1147else:1148 pureRenameCopy.add(dest)1149ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1150if not self.p4HasMoveCommand:1151p4_edit(dest)# with move: already open, writable1152 filesToChangeExecBit[dest] = diff['dst_mode']1153if not self.p4HasMoveCommand:1154 os.unlink(dest)1155 filesToDelete.add(src)1156 editedFiles.add(dest)1157else:1158die("unknown modifier%sfor%s"% (modifier, path))11591160 diffcmd ="git format-patch -k --stdout\"%s^\"..\"%s\""% (id,id)1161 patchcmd = diffcmd +" | git apply "1162 tryPatchCmd = patchcmd +"--check -"1163 applyPatchCmd = patchcmd +"--check --apply -"1164 patch_succeeded =True11651166if os.system(tryPatchCmd) !=0:1167 fixed_rcs_keywords =False1168 patch_succeeded =False1169print"Unfortunately applying the change failed!"11701171# Patch failed, maybe it's just RCS keyword woes. Look through1172# the patch to see if that's possible.1173ifgitConfig("git-p4.attemptRCSCleanup","--bool") =="true":1174file=None1175 pattern =None1176 kwfiles = {}1177forfilein editedFiles | filesToDelete:1178# did this file's delta contain RCS keywords?1179 pattern =p4_keywords_regexp_for_file(file)11801181if pattern:1182# this file is a possibility...look for RCS keywords.1183 regexp = re.compile(pattern, re.VERBOSE)1184for line inread_pipe_lines(["git","diff","%s^..%s"% (id,id),file]):1185if regexp.search(line):1186if verbose:1187print"got keyword match on%sin%sin%s"% (pattern, line,file)1188 kwfiles[file] = pattern1189break11901191forfilein kwfiles:1192if verbose:1193print"zapping%swith%s"% (line,pattern)1194 self.patchRCSKeywords(file, kwfiles[file])1195 fixed_rcs_keywords =True11961197if fixed_rcs_keywords:1198print"Retrying the patch with RCS keywords cleaned up"1199if os.system(tryPatchCmd) ==0:1200 patch_succeeded =True12011202if not patch_succeeded:1203for f in editedFiles:1204p4_revert(f)1205return False12061207#1208# Apply the patch for real, and do add/delete/+x handling.1209#1210system(applyPatchCmd)12111212for f in filesToAdd:1213p4_add(f)1214for f in filesToDelete:1215p4_revert(f)1216p4_delete(f)12171218# Set/clear executable bits1219for f in filesToChangeExecBit.keys():1220 mode = filesToChangeExecBit[f]1221setP4ExecBit(f, mode)12221223#1224# Build p4 change description, starting with the contents1225# of the git commit message.1226#1227 logMessage =extractLogMessageFromGitCommit(id)1228 logMessage = logMessage.strip()1229(logMessage, jobs) = self.separate_jobs_from_description(logMessage)12301231 template = self.prepareSubmitTemplate()1232 submitTemplate = self.prepareLogMessage(template, logMessage, jobs)12331234if self.preserveUser:1235 submitTemplate +="\n######## Actual user%s, modified after commit\n"% p4User12361237if self.checkAuthorship and not self.p4UserIsMe(p4User):1238 submitTemplate +="######## git author%sdoes not match your p4 account.\n"% gitEmail1239 submitTemplate +="######## Use option --preserve-user to modify authorship.\n"1240 submitTemplate +="######## Variable git-p4.skipUserNameCheck hides this message.\n"12411242 separatorLine ="######## everything below this line is just the diff #######\n"12431244# diff1245if os.environ.has_key("P4DIFF"):1246del(os.environ["P4DIFF"])1247 diff =""1248for editedFile in editedFiles:1249 diff +=p4_read_pipe(['diff','-du',1250wildcard_encode(editedFile)])12511252# new file diff1253 newdiff =""1254for newFile in filesToAdd:1255 newdiff +="==== new file ====\n"1256 newdiff +="--- /dev/null\n"1257 newdiff +="+++%s\n"% newFile1258 f =open(newFile,"r")1259for line in f.readlines():1260 newdiff +="+"+ line1261 f.close()12621263# change description file: submitTemplate, separatorLine, diff, newdiff1264(handle, fileName) = tempfile.mkstemp()1265 tmpFile = os.fdopen(handle,"w+")1266if self.isWindows:1267 submitTemplate = submitTemplate.replace("\n","\r\n")1268 separatorLine = separatorLine.replace("\n","\r\n")1269 newdiff = newdiff.replace("\n","\r\n")1270 tmpFile.write(submitTemplate + separatorLine + diff + newdiff)1271 tmpFile.close()12721273#1274# Let the user edit the change description, then submit it.1275#1276if self.edit_template(fileName):1277# read the edited message and submit1278 ret =True1279 tmpFile =open(fileName,"rb")1280 message = tmpFile.read()1281 tmpFile.close()1282 submitTemplate = message[:message.index(separatorLine)]1283if self.isWindows:1284 submitTemplate = submitTemplate.replace("\r\n","\n")1285p4_write_pipe(['submit','-i'], submitTemplate)12861287if self.preserveUser:1288if p4User:1289# Get last changelist number. Cannot easily get it from1290# the submit command output as the output is1291# unmarshalled.1292 changelist = self.lastP4Changelist()1293 self.modifyChangelistUser(changelist, p4User)12941295# The rename/copy happened by applying a patch that created a1296# new file. This leaves it writable, which confuses p4.1297for f in pureRenameCopy:1298p4_sync(f,"-f")12991300else:1301# skip this patch1302 ret =False1303print"Submission cancelled, undoing p4 changes."1304for f in editedFiles:1305p4_revert(f)1306for f in filesToAdd:1307p4_revert(f)1308 os.remove(f)1309for f in filesToDelete:1310p4_revert(f)13111312 os.remove(fileName)1313return ret13141315# Export git tags as p4 labels. Create a p4 label and then tag1316# with that.1317defexportGitTags(self, gitTags):1318 validLabelRegexp =gitConfig("git-p4.labelExportRegexp")1319iflen(validLabelRegexp) ==0:1320 validLabelRegexp = defaultLabelRegexp1321 m = re.compile(validLabelRegexp)13221323for name in gitTags:13241325if not m.match(name):1326if verbose:1327print"tag%sdoes not match regexp%s"% (name, validLabelRegexp)1328continue13291330# Get the p4 commit this corresponds to1331 logMessage =extractLogMessageFromGitCommit(name)1332 values =extractSettingsGitLog(logMessage)13331334if not values.has_key('change'):1335# a tag pointing to something not sent to p4; ignore1336if verbose:1337print"git tag%sdoes not give a p4 commit"% name1338continue1339else:1340 changelist = values['change']13411342# Get the tag details.1343 inHeader =True1344 isAnnotated =False1345 body = []1346for l inread_pipe_lines(["git","cat-file","-p", name]):1347 l = l.strip()1348if inHeader:1349if re.match(r'tag\s+', l):1350 isAnnotated =True1351elif re.match(r'\s*$', l):1352 inHeader =False1353continue1354else:1355 body.append(l)13561357if not isAnnotated:1358 body = ["lightweight tag imported by git p4\n"]13591360# Create the label - use the same view as the client spec we are using1361 clientSpec =getClientSpec()13621363 labelTemplate ="Label:%s\n"% name1364 labelTemplate +="Description:\n"1365for b in body:1366 labelTemplate +="\t"+ b +"\n"1367 labelTemplate +="View:\n"1368for mapping in clientSpec.mappings:1369 labelTemplate +="\t%s\n"% mapping.depot_side.path13701371if self.dry_run:1372print"Would create p4 label%sfor tag"% name1373else:1374p4_write_pipe(["label","-i"], labelTemplate)13751376# Use the label1377p4_system(["tag","-l", name] +1378["%s@%s"% (mapping.depot_side.path, changelist)for mapping in clientSpec.mappings])13791380if verbose:1381print"created p4 label for tag%s"% name13821383defrun(self, args):1384iflen(args) ==0:1385 self.master =currentGitBranch()1386iflen(self.master) ==0or notgitBranchExists("refs/heads/%s"% self.master):1387die("Detecting current git branch failed!")1388eliflen(args) ==1:1389 self.master = args[0]1390if notbranchExists(self.master):1391die("Branch%sdoes not exist"% self.master)1392else:1393return False13941395 allowSubmit =gitConfig("git-p4.allowSubmit")1396iflen(allowSubmit) >0and not self.master in allowSubmit.split(","):1397die("%sis not in git-p4.allowSubmit"% self.master)13981399[upstream, settings] =findUpstreamBranchPoint()1400 self.depotPath = settings['depot-paths'][0]1401iflen(self.origin) ==0:1402 self.origin = upstream14031404if self.preserveUser:1405if not self.canChangeChangelists():1406die("Cannot preserve user names without p4 super-user or admin permissions")14071408if self.verbose:1409print"Origin branch is "+ self.origin14101411iflen(self.depotPath) ==0:1412print"Internal error: cannot locate perforce depot path from existing branches"1413 sys.exit(128)14141415 self.useClientSpec =False1416ifgitConfig("git-p4.useclientspec","--bool") =="true":1417 self.useClientSpec =True1418if self.useClientSpec:1419 self.clientSpecDirs =getClientSpec()14201421if self.useClientSpec:1422# all files are relative to the client spec1423 self.clientPath =getClientRoot()1424else:1425 self.clientPath =p4Where(self.depotPath)14261427if self.clientPath =="":1428die("Error: Cannot locate perforce checkout of%sin client view"% self.depotPath)14291430print"Perforce checkout for depot path%slocated at%s"% (self.depotPath, self.clientPath)1431 self.oldWorkingDirectory = os.getcwd()14321433# ensure the clientPath exists1434 new_client_dir =False1435if not os.path.exists(self.clientPath):1436 new_client_dir =True1437 os.makedirs(self.clientPath)14381439chdir(self.clientPath)1440if self.dry_run:1441print"Would synchronize p4 checkout in%s"% self.clientPath1442else:1443print"Synchronizing p4 checkout..."1444if new_client_dir:1445# old one was destroyed, and maybe nobody told p41446p4_sync("...","-f")1447else:1448p4_sync("...")1449 self.check()14501451 commits = []1452for line inread_pipe_lines("git rev-list --no-merges%s..%s"% (self.origin, self.master)):1453 commits.append(line.strip())1454 commits.reverse()14551456if self.preserveUser or(gitConfig("git-p4.skipUserNameCheck") =="true"):1457 self.checkAuthorship =False1458else:1459 self.checkAuthorship =True14601461if self.preserveUser:1462 self.checkValidP4Users(commits)14631464#1465# Build up a set of options to be passed to diff when1466# submitting each commit to p4.1467#1468if self.detectRenames:1469# command-line -M arg1470 self.diffOpts ="-M"1471else:1472# If not explicitly set check the config variable1473 detectRenames =gitConfig("git-p4.detectRenames")14741475if detectRenames.lower() =="false"or detectRenames =="":1476 self.diffOpts =""1477elif detectRenames.lower() =="true":1478 self.diffOpts ="-M"1479else:1480 self.diffOpts ="-M%s"% detectRenames14811482# no command-line arg for -C or --find-copies-harder, just1483# config variables1484 detectCopies =gitConfig("git-p4.detectCopies")1485if detectCopies.lower() =="false"or detectCopies =="":1486pass1487elif detectCopies.lower() =="true":1488 self.diffOpts +=" -C"1489else:1490 self.diffOpts +=" -C%s"% detectCopies14911492ifgitConfig("git-p4.detectCopiesHarder","--bool") =="true":1493 self.diffOpts +=" --find-copies-harder"14941495#1496# Apply the commits, one at a time. On failure, ask if should1497# continue to try the rest of the patches, or quit.1498#1499if self.dry_run:1500print"Would apply"1501 applied = []1502 last =len(commits) -11503for i, commit inenumerate(commits):1504if self.dry_run:1505print" ",read_pipe(["git","show","-s",1506"--format=format:%h%s", commit])1507 ok =True1508else:1509 ok = self.applyCommit(commit)1510if ok:1511 applied.append(commit)1512else:1513if i < last:1514 quit =False1515while True:1516print"What do you want to do?"1517 response =raw_input("[s]kip this commit but apply"1518" the rest, or [q]uit? ")1519if not response:1520continue1521if response[0] =="s":1522print"Skipping this commit, but applying the rest"1523break1524if response[0] =="q":1525print"Quitting"1526 quit =True1527break1528if quit:1529break15301531chdir(self.oldWorkingDirectory)15321533if self.dry_run:1534pass1535eliflen(commits) ==len(applied):1536print"All commits applied!"15371538 sync =P4Sync()1539 sync.run([])15401541 rebase =P4Rebase()1542 rebase.rebase()15431544else:1545iflen(applied) ==0:1546print"No commits applied."1547else:1548print"Applied only the commits marked with '*':"1549for c in commits:1550if c in applied:1551 star ="*"1552else:1553 star =" "1554print star,read_pipe(["git","show","-s",1555"--format=format:%h%s", c])1556print"You will have to do 'git p4 sync' and rebase."15571558ifgitConfig("git-p4.exportLabels","--bool") =="true":1559 self.exportLabels =True15601561if self.exportLabels:1562 p4Labels =getP4Labels(self.depotPath)1563 gitTags =getGitTags()15641565 missingGitTags = gitTags - p4Labels1566 self.exportGitTags(missingGitTags)15671568# exit with error unless everything applied perfecly1569iflen(commits) !=len(applied):1570 sys.exit(1)15711572return True15731574classView(object):1575"""Represent a p4 view ("p4 help views"), and map files in a1576 repo according to the view."""15771578classPath(object):1579"""A depot or client path, possibly containing wildcards.1580 The only one supported is ... at the end, currently.1581 Initialize with the full path, with //depot or //client."""15821583def__init__(self, path, is_depot):1584 self.path = path1585 self.is_depot = is_depot1586 self.find_wildcards()1587# remember the prefix bit, useful for relative mappings1588 m = re.match("(//[^/]+/)", self.path)1589if not m:1590die("Path%sdoes not start with //prefix/"% self.path)1591 prefix = m.group(1)1592if not self.is_depot:1593# strip //client/ on client paths1594 self.path = self.path[len(prefix):]15951596deffind_wildcards(self):1597"""Make sure wildcards are valid, and set up internal1598 variables."""15991600 self.ends_triple_dot =False1601# There are three wildcards allowed in p4 views1602# (see "p4 help views"). This code knows how to1603# handle "..." (only at the end), but cannot deal with1604# "%%n" or "*". Only check the depot_side, as p4 should1605# validate that the client_side matches too.1606if re.search(r'%%[1-9]', self.path):1607die("Can't handle%%n wildcards in view:%s"% self.path)1608if self.path.find("*") >=0:1609die("Can't handle * wildcards in view:%s"% self.path)1610 triple_dot_index = self.path.find("...")1611if triple_dot_index >=0:1612if triple_dot_index !=len(self.path) -3:1613die("Can handle only single ... wildcard, at end:%s"%1614 self.path)1615 self.ends_triple_dot =True16161617defensure_compatible(self, other_path):1618"""Make sure the wildcards agree."""1619if self.ends_triple_dot != other_path.ends_triple_dot:1620die("Both paths must end with ... if either does;\n"+1621"paths:%s %s"% (self.path, other_path.path))16221623defmatch_wildcards(self, test_path):1624"""See if this test_path matches us, and fill in the value1625 of the wildcards if so. Returns a tuple of1626 (True|False, wildcards[]). For now, only the ... at end1627 is supported, so at most one wildcard."""1628if self.ends_triple_dot:1629 dotless = self.path[:-3]1630if test_path.startswith(dotless):1631 wildcard = test_path[len(dotless):]1632return(True, [ wildcard ])1633else:1634if test_path == self.path:1635return(True, [])1636return(False, [])16371638defmatch(self, test_path):1639"""Just return if it matches; don't bother with the wildcards."""1640 b, _ = self.match_wildcards(test_path)1641return b16421643deffill_in_wildcards(self, wildcards):1644"""Return the relative path, with the wildcards filled in1645 if there are any."""1646if self.ends_triple_dot:1647return self.path[:-3] + wildcards[0]1648else:1649return self.path16501651classMapping(object):1652def__init__(self, depot_side, client_side, overlay, exclude):1653# depot_side is without the trailing /... if it had one1654 self.depot_side = View.Path(depot_side, is_depot=True)1655 self.client_side = View.Path(client_side, is_depot=False)1656 self.overlay = overlay # started with "+"1657 self.exclude = exclude # started with "-"1658assert not(self.overlay and self.exclude)1659 self.depot_side.ensure_compatible(self.client_side)16601661def__str__(self):1662 c =" "1663if self.overlay:1664 c ="+"1665if self.exclude:1666 c ="-"1667return"View.Mapping:%s%s->%s"% \1668(c, self.depot_side.path, self.client_side.path)16691670defmap_depot_to_client(self, depot_path):1671"""Calculate the client path if using this mapping on the1672 given depot path; does not consider the effect of other1673 mappings in a view. Even excluded mappings are returned."""1674 matches, wildcards = self.depot_side.match_wildcards(depot_path)1675if not matches:1676return""1677 client_path = self.client_side.fill_in_wildcards(wildcards)1678return client_path16791680#1681# View methods1682#1683def__init__(self):1684 self.mappings = []16851686defappend(self, view_line):1687"""Parse a view line, splitting it into depot and client1688 sides. Append to self.mappings, preserving order."""16891690# Split the view line into exactly two words. P4 enforces1691# structure on these lines that simplifies this quite a bit.1692#1693# Either or both words may be double-quoted.1694# Single quotes do not matter.1695# Double-quote marks cannot occur inside the words.1696# A + or - prefix is also inside the quotes.1697# There are no quotes unless they contain a space.1698# The line is already white-space stripped.1699# The two words are separated by a single space.1700#1701if view_line[0] =='"':1702# First word is double quoted. Find its end.1703 close_quote_index = view_line.find('"',1)1704if close_quote_index <=0:1705die("No first-word closing quote found:%s"% view_line)1706 depot_side = view_line[1:close_quote_index]1707# skip closing quote and space1708 rhs_index = close_quote_index +1+11709else:1710 space_index = view_line.find(" ")1711if space_index <=0:1712die("No word-splitting space found:%s"% view_line)1713 depot_side = view_line[0:space_index]1714 rhs_index = space_index +117151716if view_line[rhs_index] =='"':1717# Second word is double quoted. Make sure there is a1718# double quote at the end too.1719if not view_line.endswith('"'):1720die("View line with rhs quote should end with one:%s"%1721 view_line)1722# skip the quotes1723 client_side = view_line[rhs_index+1:-1]1724else:1725 client_side = view_line[rhs_index:]17261727# prefix + means overlay on previous mapping1728 overlay =False1729if depot_side.startswith("+"):1730 overlay =True1731 depot_side = depot_side[1:]17321733# prefix - means exclude this path1734 exclude =False1735if depot_side.startswith("-"):1736 exclude =True1737 depot_side = depot_side[1:]17381739 m = View.Mapping(depot_side, client_side, overlay, exclude)1740 self.mappings.append(m)17411742defmap_in_client(self, depot_path):1743"""Return the relative location in the client where this1744 depot file should live. Returns "" if the file should1745 not be mapped in the client."""17461747 paths_filled = []1748 client_path =""17491750# look at later entries first1751for m in self.mappings[::-1]:17521753# see where will this path end up in the client1754 p = m.map_depot_to_client(depot_path)17551756if p =="":1757# Depot path does not belong in client. Must remember1758# this, as previous items should not cause files to1759# exist in this path either. Remember that the list is1760# being walked from the end, which has higher precedence.1761# Overlap mappings do not exclude previous mappings.1762if not m.overlay:1763 paths_filled.append(m.client_side)17641765else:1766# This mapping matched; no need to search any further.1767# But, the mapping could be rejected if the client path1768# has already been claimed by an earlier mapping (i.e.1769# one later in the list, which we are walking backwards).1770 already_mapped_in_client =False1771for f in paths_filled:1772# this is View.Path.match1773if f.match(p):1774 already_mapped_in_client =True1775break1776if not already_mapped_in_client:1777# Include this file, unless it is from a line that1778# explicitly said to exclude it.1779if not m.exclude:1780 client_path = p17811782# a match, even if rejected, always stops the search1783break17841785return client_path17861787classP4Sync(Command, P4UserMap):1788 delete_actions = ("delete","move/delete","purge")17891790def__init__(self):1791 Command.__init__(self)1792 P4UserMap.__init__(self)1793 self.options = [1794 optparse.make_option("--branch", dest="branch"),1795 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),1796 optparse.make_option("--changesfile", dest="changesFile"),1797 optparse.make_option("--silent", dest="silent", action="store_true"),1798 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),1799 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),1800 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",1801help="Import into refs/heads/ , not refs/remotes"),1802 optparse.make_option("--max-changes", dest="maxChanges"),1803 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',1804help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),1805 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',1806help="Only sync files that are included in the Perforce Client Spec")1807]1808 self.description ="""Imports from Perforce into a git repository.\n1809 example:1810 //depot/my/project/ -- to import the current head1811 //depot/my/project/@all -- to import everything1812 //depot/my/project/@1,6 -- to import only from revision 1 to 618131814 (a ... is not needed in the path p4 specification, it's added implicitly)"""18151816 self.usage +=" //depot/path[@revRange]"1817 self.silent =False1818 self.createdBranches =set()1819 self.committedChanges =set()1820 self.branch =""1821 self.detectBranches =False1822 self.detectLabels =False1823 self.importLabels =False1824 self.changesFile =""1825 self.syncWithOrigin =True1826 self.importIntoRemotes =True1827 self.maxChanges =""1828 self.isWindows = (platform.system() =="Windows")1829 self.keepRepoPath =False1830 self.depotPaths =None1831 self.p4BranchesInGit = []1832 self.cloneExclude = []1833 self.useClientSpec =False1834 self.useClientSpec_from_options =False1835 self.clientSpecDirs =None1836 self.tempBranches = []1837 self.tempBranchLocation ="git-p4-tmp"18381839ifgitConfig("git-p4.syncFromOrigin") =="false":1840 self.syncWithOrigin =False18411842# Force a checkpoint in fast-import and wait for it to finish1843defcheckpoint(self):1844 self.gitStream.write("checkpoint\n\n")1845 self.gitStream.write("progress checkpoint\n\n")1846 out = self.gitOutput.readline()1847if self.verbose:1848print"checkpoint finished: "+ out18491850defextractFilesFromCommit(self, commit):1851 self.cloneExclude = [re.sub(r"\.\.\.$","", path)1852for path in self.cloneExclude]1853 files = []1854 fnum =01855while commit.has_key("depotFile%s"% fnum):1856 path = commit["depotFile%s"% fnum]18571858if[p for p in self.cloneExclude1859ifp4PathStartsWith(path, p)]:1860 found =False1861else: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 files.append(file)1874 fnum = fnum +11875return files18761877defstripRepoPath(self, path, prefixes):1878if self.useClientSpec:1879return self.clientSpecDirs.map_in_client(path)18801881if self.keepRepoPath:1882 prefixes = [re.sub("^(//[^/]+/).*", r'\1', prefixes[0])]18831884for p in prefixes:1885ifp4PathStartsWith(path, p):1886 path = path[len(p):]18871888return path18891890defsplitFilesIntoBranches(self, commit):1891 branches = {}1892 fnum =01893while commit.has_key("depotFile%s"% fnum):1894 path = commit["depotFile%s"% fnum]1895 found = [p for p in self.depotPaths1896ifp4PathStartsWith(path, p)]1897if not found:1898 fnum = fnum +11899continue19001901file= {}1902file["path"] = path1903file["rev"] = commit["rev%s"% fnum]1904file["action"] = commit["action%s"% fnum]1905file["type"] = commit["type%s"% fnum]1906 fnum = fnum +119071908 relPath = self.stripRepoPath(path, self.depotPaths)1909 relPath =wildcard_decode(relPath)19101911for branch in self.knownBranches.keys():19121913# add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.21914if relPath.startswith(branch +"/"):1915if branch not in branches:1916 branches[branch] = []1917 branches[branch].append(file)1918break19191920return branches19211922# output one file from the P4 stream1923# - helper for streamP4Files19241925defstreamOneP4File(self,file, contents):1926 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)1927 relPath =wildcard_decode(relPath)1928if verbose:1929 sys.stderr.write("%s\n"% relPath)19301931(type_base, type_mods) =split_p4_type(file["type"])19321933 git_mode ="100644"1934if"x"in type_mods:1935 git_mode ="100755"1936if type_base =="symlink":1937 git_mode ="120000"1938# p4 print on a symlink contains "target\n"; remove the newline1939 data =''.join(contents)1940 contents = [data[:-1]]19411942if type_base =="utf16":1943# p4 delivers different text in the python output to -G1944# than it does when using "print -o", or normal p4 client1945# operations. utf16 is converted to ascii or utf8, perhaps.1946# But ascii text saved as -t utf16 is completely mangled.1947# Invoke print -o to get the real contents.1948 text =p4_read_pipe(['print','-q','-o','-',file['depotFile']])1949 contents = [ text ]19501951if type_base =="apple":1952# Apple filetype files will be streamed as a concatenation of1953# its appledouble header and the contents. This is useless1954# on both macs and non-macs. If using "print -q -o xx", it1955# will create "xx" with the data, and "%xx" with the header.1956# This is also not very useful.1957#1958# Ideally, someday, this script can learn how to generate1959# appledouble files directly and import those to git, but1960# non-mac machines can never find a use for apple filetype.1961print"\nIgnoring apple filetype file%s"%file['depotFile']1962return19631964# Perhaps windows wants unicode, utf16 newlines translated too;1965# but this is not doing it.1966if self.isWindows and type_base =="text":1967 mangled = []1968for data in contents:1969 data = data.replace("\r\n","\n")1970 mangled.append(data)1971 contents = mangled19721973# Note that we do not try to de-mangle keywords on utf16 files,1974# even though in theory somebody may want that.1975 pattern =p4_keywords_regexp_for_type(type_base, type_mods)1976if pattern:1977 regexp = re.compile(pattern, re.VERBOSE)1978 text =''.join(contents)1979 text = regexp.sub(r'$\1$', text)1980 contents = [ text ]19811982 self.gitStream.write("M%sinline%s\n"% (git_mode, relPath))19831984# total length...1985 length =01986for d in contents:1987 length = length +len(d)19881989 self.gitStream.write("data%d\n"% length)1990for d in contents:1991 self.gitStream.write(d)1992 self.gitStream.write("\n")19931994defstreamOneP4Deletion(self,file):1995 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)1996 relPath =wildcard_decode(relPath)1997if verbose:1998 sys.stderr.write("delete%s\n"% relPath)1999 self.gitStream.write("D%s\n"% relPath)20002001# handle another chunk of streaming data2002defstreamP4FilesCb(self, marshalled):20032004if marshalled.has_key('depotFile')and self.stream_have_file_info:2005# start of a new file - output the old one first2006 self.streamOneP4File(self.stream_file, self.stream_contents)2007 self.stream_file = {}2008 self.stream_contents = []2009 self.stream_have_file_info =False20102011# pick up the new file information... for the2012# 'data' field we need to append to our array2013for k in marshalled.keys():2014if k =='data':2015 self.stream_contents.append(marshalled['data'])2016else:2017 self.stream_file[k] = marshalled[k]20182019 self.stream_have_file_info =True20202021# Stream directly from "p4 files" into "git fast-import"2022defstreamP4Files(self, files):2023 filesForCommit = []2024 filesToRead = []2025 filesToDelete = []20262027for f in files:2028# if using a client spec, only add the files that have2029# a path in the client2030if self.clientSpecDirs:2031if self.clientSpecDirs.map_in_client(f['path']) =="":2032continue20332034 filesForCommit.append(f)2035if f['action']in self.delete_actions:2036 filesToDelete.append(f)2037else:2038 filesToRead.append(f)20392040# deleted files...2041for f in filesToDelete:2042 self.streamOneP4Deletion(f)20432044iflen(filesToRead) >0:2045 self.stream_file = {}2046 self.stream_contents = []2047 self.stream_have_file_info =False20482049# curry self argument2050defstreamP4FilesCbSelf(entry):2051 self.streamP4FilesCb(entry)20522053 fileArgs = ['%s#%s'% (f['path'], f['rev'])for f in filesToRead]20542055p4CmdList(["-x","-","print"],2056 stdin=fileArgs,2057 cb=streamP4FilesCbSelf)20582059# do the last chunk2060if self.stream_file.has_key('depotFile'):2061 self.streamOneP4File(self.stream_file, self.stream_contents)20622063defmake_email(self, userid):2064if userid in self.users:2065return self.users[userid]2066else:2067return"%s<a@b>"% userid20682069# Stream a p4 tag2070defstreamTag(self, gitStream, labelName, labelDetails, commit, epoch):2071if verbose:2072print"writing tag%sfor commit%s"% (labelName, commit)2073 gitStream.write("tag%s\n"% labelName)2074 gitStream.write("from%s\n"% commit)20752076if labelDetails.has_key('Owner'):2077 owner = labelDetails["Owner"]2078else:2079 owner =None20802081# Try to use the owner of the p4 label, or failing that,2082# the current p4 user id.2083if owner:2084 email = self.make_email(owner)2085else:2086 email = self.make_email(self.p4UserId())2087 tagger ="%s %s %s"% (email, epoch, self.tz)20882089 gitStream.write("tagger%s\n"% tagger)20902091print"labelDetails=",labelDetails2092if labelDetails.has_key('Description'):2093 description = labelDetails['Description']2094else:2095 description ='Label from git p4'20962097 gitStream.write("data%d\n"%len(description))2098 gitStream.write(description)2099 gitStream.write("\n")21002101defcommit(self, details, files, branch, branchPrefixes, parent =""):2102 epoch = details["time"]2103 author = details["user"]2104 self.branchPrefixes = branchPrefixes21052106if self.verbose:2107print"commit into%s"% branch21082109# start with reading files; if that fails, we should not2110# create a commit.2111 new_files = []2112for f in files:2113if[p for p in branchPrefixes ifp4PathStartsWith(f['path'], p)]:2114 new_files.append(f)2115else:2116 sys.stderr.write("Ignoring file outside of prefix:%s\n"% f['path'])21172118 self.gitStream.write("commit%s\n"% branch)2119# gitStream.write("mark :%s\n" % details["change"])2120 self.committedChanges.add(int(details["change"]))2121 committer =""2122if author not in self.users:2123 self.getUserMapFromPerforceServer()2124 committer ="%s %s %s"% (self.make_email(author), epoch, self.tz)21252126 self.gitStream.write("committer%s\n"% committer)21272128 self.gitStream.write("data <<EOT\n")2129 self.gitStream.write(details["desc"])2130 self.gitStream.write("\n[git-p4: depot-paths =\"%s\": change =%s"2131% (','.join(branchPrefixes), details["change"]))2132iflen(details['options']) >0:2133 self.gitStream.write(": options =%s"% details['options'])2134 self.gitStream.write("]\nEOT\n\n")21352136iflen(parent) >0:2137if self.verbose:2138print"parent%s"% parent2139 self.gitStream.write("from%s\n"% parent)21402141 self.streamP4Files(new_files)2142 self.gitStream.write("\n")21432144 change =int(details["change"])21452146if self.labels.has_key(change):2147 label = self.labels[change]2148 labelDetails = label[0]2149 labelRevisions = label[1]2150if self.verbose:2151print"Change%sis labelled%s"% (change, labelDetails)21522153 files =p4CmdList(["files"] + ["%s...@%s"% (p, change)2154for p in branchPrefixes])21552156iflen(files) ==len(labelRevisions):21572158 cleanedFiles = {}2159for info in files:2160if info["action"]in self.delete_actions:2161continue2162 cleanedFiles[info["depotFile"]] = info["rev"]21632164if cleanedFiles == labelRevisions:2165 self.streamTag(self.gitStream,'tag_%s'% labelDetails['label'], labelDetails, branch, epoch)21662167else:2168if not self.silent:2169print("Tag%sdoes not match with change%s: files do not match."2170% (labelDetails["label"], change))21712172else:2173if not self.silent:2174print("Tag%sdoes not match with change%s: file count is different."2175% (labelDetails["label"], change))21762177# Build a dictionary of changelists and labels, for "detect-labels" option.2178defgetLabels(self):2179 self.labels = {}21802181 l =p4CmdList(["labels"] + ["%s..."% p for p in self.depotPaths])2182iflen(l) >0and not self.silent:2183print"Finding files belonging to labels in%s"% `self.depotPaths`21842185for output in l:2186 label = output["label"]2187 revisions = {}2188 newestChange =02189if self.verbose:2190print"Querying files for label%s"% label2191forfileinp4CmdList(["files"] +2192["%s...@%s"% (p, label)2193for p in self.depotPaths]):2194 revisions[file["depotFile"]] =file["rev"]2195 change =int(file["change"])2196if change > newestChange:2197 newestChange = change21982199 self.labels[newestChange] = [output, revisions]22002201if self.verbose:2202print"Label changes:%s"% self.labels.keys()22032204# Import p4 labels as git tags. A direct mapping does not2205# exist, so assume that if all the files are at the same revision2206# then we can use that, or it's something more complicated we should2207# just ignore.2208defimportP4Labels(self, stream, p4Labels):2209if verbose:2210print"import p4 labels: "+' '.join(p4Labels)22112212 ignoredP4Labels =gitConfigList("git-p4.ignoredP4Labels")2213 validLabelRegexp =gitConfig("git-p4.labelImportRegexp")2214iflen(validLabelRegexp) ==0:2215 validLabelRegexp = defaultLabelRegexp2216 m = re.compile(validLabelRegexp)22172218for name in p4Labels:2219 commitFound =False22202221if not m.match(name):2222if verbose:2223print"label%sdoes not match regexp%s"% (name,validLabelRegexp)2224continue22252226if name in ignoredP4Labels:2227continue22282229 labelDetails =p4CmdList(['label',"-o", name])[0]22302231# get the most recent changelist for each file in this label2232 change =p4Cmd(["changes","-m","1"] + ["%s...@%s"% (p, name)2233for p in self.depotPaths])22342235if change.has_key('change'):2236# find the corresponding git commit; take the oldest commit2237 changelist =int(change['change'])2238 gitCommit =read_pipe(["git","rev-list","--max-count=1",2239"--reverse",":/\[git-p4:.*change =%d\]"% changelist])2240iflen(gitCommit) ==0:2241print"could not find git commit for changelist%d"% changelist2242else:2243 gitCommit = gitCommit.strip()2244 commitFound =True2245# Convert from p4 time format2246try:2247 tmwhen = time.strptime(labelDetails['Update'],"%Y/%m/%d%H:%M:%S")2248exceptValueError:2249print"Could not convert label time%s"% labelDetail['Update']2250 tmwhen =122512252 when =int(time.mktime(tmwhen))2253 self.streamTag(stream, name, labelDetails, gitCommit, when)2254if verbose:2255print"p4 label%smapped to git commit%s"% (name, gitCommit)2256else:2257if verbose:2258print"Label%shas no changelists - possibly deleted?"% name22592260if not commitFound:2261# We can't import this label; don't try again as it will get very2262# expensive repeatedly fetching all the files for labels that will2263# never be imported. If the label is moved in the future, the2264# ignore will need to be removed manually.2265system(["git","config","--add","git-p4.ignoredP4Labels", name])22662267defguessProjectName(self):2268for p in self.depotPaths:2269if p.endswith("/"):2270 p = p[:-1]2271 p = p[p.strip().rfind("/") +1:]2272if not p.endswith("/"):2273 p +="/"2274return p22752276defgetBranchMapping(self):2277 lostAndFoundBranches =set()22782279 user =gitConfig("git-p4.branchUser")2280iflen(user) >0:2281 command ="branches -u%s"% user2282else:2283 command ="branches"22842285for info inp4CmdList(command):2286 details =p4Cmd(["branch","-o", info["branch"]])2287 viewIdx =02288while details.has_key("View%s"% viewIdx):2289 paths = details["View%s"% viewIdx].split(" ")2290 viewIdx = viewIdx +12291# require standard //depot/foo/... //depot/bar/... mapping2292iflen(paths) !=2or not paths[0].endswith("/...")or not paths[1].endswith("/..."):2293continue2294 source = paths[0]2295 destination = paths[1]2296## HACK2297ifp4PathStartsWith(source, self.depotPaths[0])andp4PathStartsWith(destination, self.depotPaths[0]):2298 source = source[len(self.depotPaths[0]):-4]2299 destination = destination[len(self.depotPaths[0]):-4]23002301if destination in self.knownBranches:2302if not self.silent:2303print"p4 branch%sdefines a mapping from%sto%s"% (info["branch"], source, destination)2304print"but there exists another mapping from%sto%salready!"% (self.knownBranches[destination], destination)2305continue23062307 self.knownBranches[destination] = source23082309 lostAndFoundBranches.discard(destination)23102311if source not in self.knownBranches:2312 lostAndFoundBranches.add(source)23132314# Perforce does not strictly require branches to be defined, so we also2315# check git config for a branch list.2316#2317# Example of branch definition in git config file:2318# [git-p4]2319# branchList=main:branchA2320# branchList=main:branchB2321# branchList=branchA:branchC2322 configBranches =gitConfigList("git-p4.branchList")2323for branch in configBranches:2324if branch:2325(source, destination) = branch.split(":")2326 self.knownBranches[destination] = source23272328 lostAndFoundBranches.discard(destination)23292330if source not in self.knownBranches:2331 lostAndFoundBranches.add(source)233223332334for branch in lostAndFoundBranches:2335 self.knownBranches[branch] = branch23362337defgetBranchMappingFromGitBranches(self):2338 branches =p4BranchesInGit(self.importIntoRemotes)2339for branch in branches.keys():2340if branch =="master":2341 branch ="main"2342else:2343 branch = branch[len(self.projectName):]2344 self.knownBranches[branch] = branch23452346deflistExistingP4GitBranches(self):2347# branches holds mapping from name to commit2348 branches =p4BranchesInGit(self.importIntoRemotes)2349 self.p4BranchesInGit = branches.keys()2350for branch in branches.keys():2351 self.initialParents[self.refPrefix + branch] = branches[branch]23522353defupdateOptionDict(self, d):2354 option_keys = {}2355if self.keepRepoPath:2356 option_keys['keepRepoPath'] =123572358 d["options"] =' '.join(sorted(option_keys.keys()))23592360defreadOptions(self, d):2361 self.keepRepoPath = (d.has_key('options')2362and('keepRepoPath'in d['options']))23632364defgitRefForBranch(self, branch):2365if branch =="main":2366return self.refPrefix +"master"23672368iflen(branch) <=0:2369return branch23702371return self.refPrefix + self.projectName + branch23722373defgitCommitByP4Change(self, ref, change):2374if self.verbose:2375print"looking in ref "+ ref +" for change%susing bisect..."% change23762377 earliestCommit =""2378 latestCommit =parseRevision(ref)23792380while True:2381if self.verbose:2382print"trying: earliest%slatest%s"% (earliestCommit, latestCommit)2383 next =read_pipe("git rev-list --bisect%s %s"% (latestCommit, earliestCommit)).strip()2384iflen(next) ==0:2385if self.verbose:2386print"argh"2387return""2388 log =extractLogMessageFromGitCommit(next)2389 settings =extractSettingsGitLog(log)2390 currentChange =int(settings['change'])2391if self.verbose:2392print"current change%s"% currentChange23932394if currentChange == change:2395if self.verbose:2396print"found%s"% next2397return next23982399if currentChange < change:2400 earliestCommit ="^%s"% next2401else:2402 latestCommit ="%s"% next24032404return""24052406defimportNewBranch(self, branch, maxChange):2407# make fast-import flush all changes to disk and update the refs using the checkpoint2408# command so that we can try to find the branch parent in the git history2409 self.gitStream.write("checkpoint\n\n");2410 self.gitStream.flush();2411 branchPrefix = self.depotPaths[0] + branch +"/"2412range="@1,%s"% maxChange2413#print "prefix" + branchPrefix2414 changes =p4ChangesForPaths([branchPrefix],range)2415iflen(changes) <=0:2416return False2417 firstChange = changes[0]2418#print "first change in branch: %s" % firstChange2419 sourceBranch = self.knownBranches[branch]2420 sourceDepotPath = self.depotPaths[0] + sourceBranch2421 sourceRef = self.gitRefForBranch(sourceBranch)2422#print "source " + sourceBranch24232424 branchParentChange =int(p4Cmd(["changes","-m","1","%s...@1,%s"% (sourceDepotPath, firstChange)])["change"])2425#print "branch parent: %s" % branchParentChange2426 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)2427iflen(gitParent) >0:2428 self.initialParents[self.gitRefForBranch(branch)] = gitParent2429#print "parent git commit: %s" % gitParent24302431 self.importChanges(changes)2432return True24332434defsearchParent(self, parent, branch, target):2435 parentFound =False2436for blob inread_pipe_lines(["git","rev-list","--reverse","--no-merges", parent]):2437 blob = blob.strip()2438iflen(read_pipe(["git","diff-tree", blob, target])) ==0:2439 parentFound =True2440if self.verbose:2441print"Found parent of%sin commit%s"% (branch, blob)2442break2443if parentFound:2444return blob2445else:2446return None24472448defimportChanges(self, changes):2449 cnt =12450for change in changes:2451 description =p4Cmd(["describe",str(change)])2452 self.updateOptionDict(description)24532454if not self.silent:2455 sys.stdout.write("\rImporting revision%s(%s%%)"% (change, cnt *100/len(changes)))2456 sys.stdout.flush()2457 cnt = cnt +124582459try:2460if self.detectBranches:2461 branches = self.splitFilesIntoBranches(description)2462for branch in branches.keys():2463## HACK --hwn2464 branchPrefix = self.depotPaths[0] + branch +"/"24652466 parent =""24672468 filesForCommit = branches[branch]24692470if self.verbose:2471print"branch is%s"% branch24722473 self.updatedBranches.add(branch)24742475if branch not in self.createdBranches:2476 self.createdBranches.add(branch)2477 parent = self.knownBranches[branch]2478if parent == branch:2479 parent =""2480else:2481 fullBranch = self.projectName + branch2482if fullBranch not in self.p4BranchesInGit:2483if not self.silent:2484print("\nImporting new branch%s"% fullBranch);2485if self.importNewBranch(branch, change -1):2486 parent =""2487 self.p4BranchesInGit.append(fullBranch)2488if not self.silent:2489print("\nResuming with change%s"% change);24902491if self.verbose:2492print"parent determined through known branches:%s"% parent24932494 branch = self.gitRefForBranch(branch)2495 parent = self.gitRefForBranch(parent)24962497if self.verbose:2498print"looking for initial parent for%s; current parent is%s"% (branch, parent)24992500iflen(parent) ==0and branch in self.initialParents:2501 parent = self.initialParents[branch]2502del self.initialParents[branch]25032504 blob =None2505iflen(parent) >0:2506 tempBranch = os.path.join(self.tempBranchLocation,"%d"% (change))2507if self.verbose:2508print"Creating temporary branch: "+ tempBranch2509 self.commit(description, filesForCommit, tempBranch, [branchPrefix])2510 self.tempBranches.append(tempBranch)2511 self.checkpoint()2512 blob = self.searchParent(parent, branch, tempBranch)2513if blob:2514 self.commit(description, filesForCommit, branch, [branchPrefix], blob)2515else:2516if self.verbose:2517print"Parent of%snot found. Committing into head of%s"% (branch, parent)2518 self.commit(description, filesForCommit, branch, [branchPrefix], parent)2519else:2520 files = self.extractFilesFromCommit(description)2521 self.commit(description, files, self.branch, self.depotPaths,2522 self.initialParent)2523 self.initialParent =""2524exceptIOError:2525print self.gitError.read()2526 sys.exit(1)25272528defimportHeadRevision(self, revision):2529print"Doing initial import of%sfrom revision%sinto%s"% (' '.join(self.depotPaths), revision, self.branch)25302531 details = {}2532 details["user"] ="git perforce import user"2533 details["desc"] = ("Initial import of%sfrom the state at revision%s\n"2534% (' '.join(self.depotPaths), revision))2535 details["change"] = revision2536 newestRevision =025372538 fileCnt =02539 fileArgs = ["%s...%s"% (p,revision)for p in self.depotPaths]25402541for info inp4CmdList(["files"] + fileArgs):25422543if'code'in info and info['code'] =='error':2544 sys.stderr.write("p4 returned an error:%s\n"2545% info['data'])2546if info['data'].find("must refer to client") >=0:2547 sys.stderr.write("This particular p4 error is misleading.\n")2548 sys.stderr.write("Perhaps the depot path was misspelled.\n");2549 sys.stderr.write("Depot path:%s\n"%" ".join(self.depotPaths))2550 sys.exit(1)2551if'p4ExitCode'in info:2552 sys.stderr.write("p4 exitcode:%s\n"% info['p4ExitCode'])2553 sys.exit(1)255425552556 change =int(info["change"])2557if change > newestRevision:2558 newestRevision = change25592560if info["action"]in self.delete_actions:2561# don't increase the file cnt, otherwise details["depotFile123"] will have gaps!2562#fileCnt = fileCnt + 12563continue25642565for prop in["depotFile","rev","action","type"]:2566 details["%s%s"% (prop, fileCnt)] = info[prop]25672568 fileCnt = fileCnt +125692570 details["change"] = newestRevision25712572# Use time from top-most change so that all git p4 clones of2573# the same p4 repo have the same commit SHA1s.2574 res =p4CmdList("describe -s%d"% newestRevision)2575 newestTime =None2576for r in res:2577if r.has_key('time'):2578 newestTime =int(r['time'])2579if newestTime is None:2580die("\"describe -s\"on newest change%ddid not give a time")2581 details["time"] = newestTime25822583 self.updateOptionDict(details)2584try:2585 self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPaths)2586exceptIOError:2587print"IO error with git fast-import. Is your git version recent enough?"2588print self.gitError.read()258925902591defrun(self, args):2592 self.depotPaths = []2593 self.changeRange =""2594 self.initialParent =""2595 self.previousDepotPaths = []25962597# map from branch depot path to parent branch2598 self.knownBranches = {}2599 self.initialParents = {}2600 self.hasOrigin =originP4BranchesExist()2601if not self.syncWithOrigin:2602 self.hasOrigin =False26032604if self.importIntoRemotes:2605 self.refPrefix ="refs/remotes/p4/"2606else:2607 self.refPrefix ="refs/heads/p4/"26082609if self.syncWithOrigin and self.hasOrigin:2610if not self.silent:2611print"Syncing with origin first by calling git fetch origin"2612system("git fetch origin")26132614iflen(self.branch) ==0:2615 self.branch = self.refPrefix +"master"2616ifgitBranchExists("refs/heads/p4")and self.importIntoRemotes:2617system("git update-ref%srefs/heads/p4"% self.branch)2618system("git branch -D p4");2619# create it /after/ importing, when master exists2620if notgitBranchExists(self.refPrefix +"HEAD")and self.importIntoRemotes andgitBranchExists(self.branch):2621system("git symbolic-ref%sHEAD%s"% (self.refPrefix, self.branch))26222623# accept either the command-line option, or the configuration variable2624if self.useClientSpec:2625# will use this after clone to set the variable2626 self.useClientSpec_from_options =True2627else:2628ifgitConfig("git-p4.useclientspec","--bool") =="true":2629 self.useClientSpec =True2630if self.useClientSpec:2631 self.clientSpecDirs =getClientSpec()26322633# TODO: should always look at previous commits,2634# merge with previous imports, if possible.2635if args == []:2636if self.hasOrigin:2637createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)2638 self.listExistingP4GitBranches()26392640iflen(self.p4BranchesInGit) >1:2641if not self.silent:2642print"Importing from/into multiple branches"2643 self.detectBranches =True26442645if self.verbose:2646print"branches:%s"% self.p4BranchesInGit26472648 p4Change =02649for branch in self.p4BranchesInGit:2650 logMsg =extractLogMessageFromGitCommit(self.refPrefix + branch)26512652 settings =extractSettingsGitLog(logMsg)26532654 self.readOptions(settings)2655if(settings.has_key('depot-paths')2656and settings.has_key('change')):2657 change =int(settings['change']) +12658 p4Change =max(p4Change, change)26592660 depotPaths =sorted(settings['depot-paths'])2661if self.previousDepotPaths == []:2662 self.previousDepotPaths = depotPaths2663else:2664 paths = []2665for(prev, cur)inzip(self.previousDepotPaths, depotPaths):2666 prev_list = prev.split("/")2667 cur_list = cur.split("/")2668for i inrange(0,min(len(cur_list),len(prev_list))):2669if cur_list[i] <> prev_list[i]:2670 i = i -12671break26722673 paths.append("/".join(cur_list[:i +1]))26742675 self.previousDepotPaths = paths26762677if p4Change >0:2678 self.depotPaths =sorted(self.previousDepotPaths)2679 self.changeRange ="@%s,#head"% p4Change2680if not self.detectBranches:2681 self.initialParent =parseRevision(self.branch)2682if not self.silent and not self.detectBranches:2683print"Performing incremental import into%sgit branch"% self.branch26842685if not self.branch.startswith("refs/"):2686 self.branch ="refs/heads/"+ self.branch26872688iflen(args) ==0and self.depotPaths:2689if not self.silent:2690print"Depot paths:%s"%' '.join(self.depotPaths)2691else:2692if self.depotPaths and self.depotPaths != args:2693print("previous import used depot path%sand now%swas specified. "2694"This doesn't work!"% (' '.join(self.depotPaths),2695' '.join(args)))2696 sys.exit(1)26972698 self.depotPaths =sorted(args)26992700 revision =""2701 self.users = {}27022703# Make sure no revision specifiers are used when --changesfile2704# is specified.2705 bad_changesfile =False2706iflen(self.changesFile) >0:2707for p in self.depotPaths:2708if p.find("@") >=0or p.find("#") >=0:2709 bad_changesfile =True2710break2711if bad_changesfile:2712die("Option --changesfile is incompatible with revision specifiers")27132714 newPaths = []2715for p in self.depotPaths:2716if p.find("@") != -1:2717 atIdx = p.index("@")2718 self.changeRange = p[atIdx:]2719if self.changeRange =="@all":2720 self.changeRange =""2721elif','not in self.changeRange:2722 revision = self.changeRange2723 self.changeRange =""2724 p = p[:atIdx]2725elif p.find("#") != -1:2726 hashIdx = p.index("#")2727 revision = p[hashIdx:]2728 p = p[:hashIdx]2729elif self.previousDepotPaths == []:2730# pay attention to changesfile, if given, else import2731# the entire p4 tree at the head revision2732iflen(self.changesFile) ==0:2733 revision ="#head"27342735 p = re.sub("\.\.\.$","", p)2736if not p.endswith("/"):2737 p +="/"27382739 newPaths.append(p)27402741 self.depotPaths = newPaths27422743 self.loadUserMapFromCache()2744 self.labels = {}2745if self.detectLabels:2746 self.getLabels();27472748if self.detectBranches:2749## FIXME - what's a P4 projectName ?2750 self.projectName = self.guessProjectName()27512752if self.hasOrigin:2753 self.getBranchMappingFromGitBranches()2754else:2755 self.getBranchMapping()2756if self.verbose:2757print"p4-git branches:%s"% self.p4BranchesInGit2758print"initial parents:%s"% self.initialParents2759for b in self.p4BranchesInGit:2760if b !="master":27612762## FIXME2763 b = b[len(self.projectName):]2764 self.createdBranches.add(b)27652766 self.tz ="%+03d%02d"% (- time.timezone /3600, ((- time.timezone %3600) /60))27672768 importProcess = subprocess.Popen(["git","fast-import"],2769 stdin=subprocess.PIPE, stdout=subprocess.PIPE,2770 stderr=subprocess.PIPE);2771 self.gitOutput = importProcess.stdout2772 self.gitStream = importProcess.stdin2773 self.gitError = importProcess.stderr27742775if revision:2776 self.importHeadRevision(revision)2777else:2778 changes = []27792780iflen(self.changesFile) >0:2781 output =open(self.changesFile).readlines()2782 changeSet =set()2783for line in output:2784 changeSet.add(int(line))27852786for change in changeSet:2787 changes.append(change)27882789 changes.sort()2790else:2791# catch "git p4 sync" with no new branches, in a repo that2792# does not have any existing p4 branches2793iflen(args) ==0and not self.p4BranchesInGit:2794die("No remote p4 branches. Perhaps you never did\"git p4 clone\"in here.");2795if self.verbose:2796print"Getting p4 changes for%s...%s"% (', '.join(self.depotPaths),2797 self.changeRange)2798 changes =p4ChangesForPaths(self.depotPaths, self.changeRange)27992800iflen(self.maxChanges) >0:2801 changes = changes[:min(int(self.maxChanges),len(changes))]28022803iflen(changes) ==0:2804if not self.silent:2805print"No changes to import!"2806else:2807if not self.silent and not self.detectBranches:2808print"Import destination:%s"% self.branch28092810 self.updatedBranches =set()28112812 self.importChanges(changes)28132814if not self.silent:2815print""2816iflen(self.updatedBranches) >0:2817 sys.stdout.write("Updated branches: ")2818for b in self.updatedBranches:2819 sys.stdout.write("%s"% b)2820 sys.stdout.write("\n")28212822ifgitConfig("git-p4.importLabels","--bool") =="true":2823 self.importLabels =True28242825if self.importLabels:2826 p4Labels =getP4Labels(self.depotPaths)2827 gitTags =getGitTags()28282829 missingP4Labels = p4Labels - gitTags2830 self.importP4Labels(self.gitStream, missingP4Labels)28312832 self.gitStream.close()2833if importProcess.wait() !=0:2834die("fast-import failed:%s"% self.gitError.read())2835 self.gitOutput.close()2836 self.gitError.close()28372838# Cleanup temporary branches created during import2839if self.tempBranches != []:2840for branch in self.tempBranches:2841read_pipe("git update-ref -d%s"% branch)2842 os.rmdir(os.path.join(os.environ.get("GIT_DIR",".git"), self.tempBranchLocation))28432844return True28452846classP4Rebase(Command):2847def__init__(self):2848 Command.__init__(self)2849 self.options = [2850 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),2851]2852 self.importLabels =False2853 self.description = ("Fetches the latest revision from perforce and "2854+"rebases the current work (branch) against it")28552856defrun(self, args):2857 sync =P4Sync()2858 sync.importLabels = self.importLabels2859 sync.run([])28602861return self.rebase()28622863defrebase(self):2864if os.system("git update-index --refresh") !=0:2865die("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.");2866iflen(read_pipe("git diff-index HEAD --")) >0:2867die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash.");28682869[upstream, settings] =findUpstreamBranchPoint()2870iflen(upstream) ==0:2871die("Cannot find upstream branchpoint for rebase")28722873# the branchpoint may be p4/foo~3, so strip off the parent2874 upstream = re.sub("~[0-9]+$","", upstream)28752876print"Rebasing the current branch onto%s"% upstream2877 oldHead =read_pipe("git rev-parse HEAD").strip()2878system("git rebase%s"% upstream)2879system("git diff-tree --stat --summary -M%sHEAD"% oldHead)2880return True28812882classP4Clone(P4Sync):2883def__init__(self):2884 P4Sync.__init__(self)2885 self.description ="Creates a new git repository and imports from Perforce into it"2886 self.usage ="usage: %prog [options] //depot/path[@revRange]"2887 self.options += [2888 optparse.make_option("--destination", dest="cloneDestination",2889 action='store', default=None,2890help="where to leave result of the clone"),2891 optparse.make_option("-/", dest="cloneExclude",2892 action="append",type="string",2893help="exclude depot path"),2894 optparse.make_option("--bare", dest="cloneBare",2895 action="store_true", default=False),2896]2897 self.cloneDestination =None2898 self.needsGit =False2899 self.cloneBare =False29002901# This is required for the "append" cloneExclude action2902defensure_value(self, attr, value):2903if nothasattr(self, attr)orgetattr(self, attr)is None:2904setattr(self, attr, value)2905returngetattr(self, attr)29062907defdefaultDestination(self, args):2908## TODO: use common prefix of args?2909 depotPath = args[0]2910 depotDir = re.sub("(@[^@]*)$","", depotPath)2911 depotDir = re.sub("(#[^#]*)$","", depotDir)2912 depotDir = re.sub(r"\.\.\.$","", depotDir)2913 depotDir = re.sub(r"/$","", depotDir)2914return os.path.split(depotDir)[1]29152916defrun(self, args):2917iflen(args) <1:2918return False29192920if self.keepRepoPath and not self.cloneDestination:2921 sys.stderr.write("Must specify destination for --keep-path\n")2922 sys.exit(1)29232924 depotPaths = args29252926if not self.cloneDestination andlen(depotPaths) >1:2927 self.cloneDestination = depotPaths[-1]2928 depotPaths = depotPaths[:-1]29292930 self.cloneExclude = ["/"+p for p in self.cloneExclude]2931for p in depotPaths:2932if not p.startswith("//"):2933return False29342935if not self.cloneDestination:2936 self.cloneDestination = self.defaultDestination(args)29372938print"Importing from%sinto%s"% (', '.join(depotPaths), self.cloneDestination)29392940if not os.path.exists(self.cloneDestination):2941 os.makedirs(self.cloneDestination)2942chdir(self.cloneDestination)29432944 init_cmd = ["git","init"]2945if self.cloneBare:2946 init_cmd.append("--bare")2947 subprocess.check_call(init_cmd)29482949if not P4Sync.run(self, depotPaths):2950return False2951if self.branch !="master":2952if self.importIntoRemotes:2953 masterbranch ="refs/remotes/p4/master"2954else:2955 masterbranch ="refs/heads/p4/master"2956ifgitBranchExists(masterbranch):2957system("git branch master%s"% masterbranch)2958if not self.cloneBare:2959system("git checkout -f")2960else:2961print"Could not detect main branch. No checkout/master branch created."29622963# auto-set this variable if invoked with --use-client-spec2964if self.useClientSpec_from_options:2965system("git config --bool git-p4.useclientspec true")29662967return True29682969classP4Branches(Command):2970def__init__(self):2971 Command.__init__(self)2972 self.options = [ ]2973 self.description = ("Shows the git branches that hold imports and their "2974+"corresponding perforce depot paths")2975 self.verbose =False29762977defrun(self, args):2978iforiginP4BranchesExist():2979createOrUpdateBranchesFromOrigin()29802981 cmdline ="git rev-parse --symbolic "2982 cmdline +=" --remotes"29832984for line inread_pipe_lines(cmdline):2985 line = line.strip()29862987if not line.startswith('p4/')or line =="p4/HEAD":2988continue2989 branch = line29902991 log =extractLogMessageFromGitCommit("refs/remotes/%s"% branch)2992 settings =extractSettingsGitLog(log)29932994print"%s<=%s(%s)"% (branch,",".join(settings["depot-paths"]), settings["change"])2995return True29962997classHelpFormatter(optparse.IndentedHelpFormatter):2998def__init__(self):2999 optparse.IndentedHelpFormatter.__init__(self)30003001defformat_description(self, description):3002if description:3003return description +"\n"3004else:3005return""30063007defprintUsage(commands):3008print"usage:%s<command> [options]"% sys.argv[0]3009print""3010print"valid commands:%s"%", ".join(commands)3011print""3012print"Try%s<command> --help for command specific help."% sys.argv[0]3013print""30143015commands = {3016"debug": P4Debug,3017"submit": P4Submit,3018"commit": P4Submit,3019"sync": P4Sync,3020"rebase": P4Rebase,3021"clone": P4Clone,3022"rollback": P4RollBack,3023"branches": P4Branches3024}302530263027defmain():3028iflen(sys.argv[1:]) ==0:3029printUsage(commands.keys())3030 sys.exit(2)30313032 cmd =""3033 cmdName = sys.argv[1]3034try:3035 klass = commands[cmdName]3036 cmd =klass()3037exceptKeyError:3038print"unknown command%s"% cmdName3039print""3040printUsage(commands.keys())3041 sys.exit(2)30423043 options = cmd.options3044 cmd.gitdir = os.environ.get("GIT_DIR",None)30453046 args = sys.argv[2:]30473048 options.append(optparse.make_option("--verbose","-v", dest="verbose", action="store_true"))3049if cmd.needsGit:3050 options.append(optparse.make_option("--git-dir", dest="gitdir"))30513052 parser = optparse.OptionParser(cmd.usage.replace("%prog","%prog "+ cmdName),3053 options,3054 description = cmd.description,3055 formatter =HelpFormatter())30563057(cmd, args) = parser.parse_args(sys.argv[2:], cmd);3058global verbose3059 verbose = cmd.verbose3060if cmd.needsGit:3061if cmd.gitdir ==None:3062 cmd.gitdir = os.path.abspath(".git")3063if notisValidGitDir(cmd.gitdir):3064 cmd.gitdir =read_pipe("git rev-parse --git-dir").strip()3065if os.path.exists(cmd.gitdir):3066 cdup =read_pipe("git rev-parse --show-cdup").strip()3067iflen(cdup) >0:3068chdir(cdup);30693070if notisValidGitDir(cmd.gitdir):3071ifisValidGitDir(cmd.gitdir +"/.git"):3072 cmd.gitdir +="/.git"3073else:3074die("fatal: cannot locate git repository at%s"% cmd.gitdir)30753076 os.environ["GIT_DIR"] = cmd.gitdir30773078if not cmd.run(args):3079 parser.print_help()3080 sys.exit(2)308130823083if __name__ =='__main__':3084main()