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 132defp4_has_move_command(): 133"""See if the move command exists, that it supports -k, and that 134 it has not been administratively disabled. The arguments 135 must be correct, but the filenames do not have to exist. Use 136 ones with wildcards so even if they exist, it will fail.""" 137 138if notp4_has_command("move"): 139return False 140 cmd =p4_build_cmd(["move","-k","@from","@to"]) 141 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 142(out, err) = p.communicate() 143# return code will be 1 in either case 144if err.find("Invalid option") >=0: 145return False 146if err.find("disabled") >=0: 147return False 148# assume it failed because @... was invalid changelist 149return True 150 151defsystem(cmd): 152 expand =isinstance(cmd,basestring) 153if verbose: 154 sys.stderr.write("executing%s\n"%str(cmd)) 155 subprocess.check_call(cmd, shell=expand) 156 157defp4_system(cmd): 158"""Specifically invoke p4 as the system command. """ 159 real_cmd =p4_build_cmd(cmd) 160 expand =isinstance(real_cmd, basestring) 161 subprocess.check_call(real_cmd, shell=expand) 162 163defp4_integrate(src, dest): 164p4_system(["integrate","-Dt",wildcard_encode(src),wildcard_encode(dest)]) 165 166defp4_sync(f, *options): 167p4_system(["sync"] +list(options) + [wildcard_encode(f)]) 168 169defp4_add(f): 170# forcibly add file names with wildcards 171ifwildcard_present(f): 172p4_system(["add","-f", f]) 173else: 174p4_system(["add", f]) 175 176defp4_delete(f): 177p4_system(["delete",wildcard_encode(f)]) 178 179defp4_edit(f): 180p4_system(["edit",wildcard_encode(f)]) 181 182defp4_revert(f): 183p4_system(["revert",wildcard_encode(f)]) 184 185defp4_reopen(type, f): 186p4_system(["reopen","-t",type,wildcard_encode(f)]) 187 188defp4_move(src, dest): 189p4_system(["move","-k",wildcard_encode(src),wildcard_encode(dest)]) 190 191defp4_describe(change): 192"""Make sure it returns a valid result by checking for 193 the presence of field "time". Return a dict of the 194 results.""" 195 196 ds =p4CmdList(["describe","-s",str(change)]) 197iflen(ds) !=1: 198die("p4 describe -s%ddid not return 1 result:%s"% (change,str(ds))) 199 200 d = ds[0] 201 202if"p4ExitCode"in d: 203die("p4 describe -s%dexited with%d:%s"% (change, d["p4ExitCode"], 204str(d))) 205if"code"in d: 206if d["code"] =="error": 207die("p4 describe -s%dreturned error code:%s"% (change,str(d))) 208 209if"time"not in d: 210die("p4 describe -s%dreturned no\"time\":%s"% (change,str(d))) 211 212return d 213 214# 215# Canonicalize the p4 type and return a tuple of the 216# base type, plus any modifiers. See "p4 help filetypes" 217# for a list and explanation. 218# 219defsplit_p4_type(p4type): 220 221 p4_filetypes_historical = { 222"ctempobj":"binary+Sw", 223"ctext":"text+C", 224"cxtext":"text+Cx", 225"ktext":"text+k", 226"kxtext":"text+kx", 227"ltext":"text+F", 228"tempobj":"binary+FSw", 229"ubinary":"binary+F", 230"uresource":"resource+F", 231"uxbinary":"binary+Fx", 232"xbinary":"binary+x", 233"xltext":"text+Fx", 234"xtempobj":"binary+Swx", 235"xtext":"text+x", 236"xunicode":"unicode+x", 237"xutf16":"utf16+x", 238} 239if p4type in p4_filetypes_historical: 240 p4type = p4_filetypes_historical[p4type] 241 mods ="" 242 s = p4type.split("+") 243 base = s[0] 244 mods ="" 245iflen(s) >1: 246 mods = s[1] 247return(base, mods) 248 249# 250# return the raw p4 type of a file (text, text+ko, etc) 251# 252defp4_type(file): 253 results =p4CmdList(["fstat","-T","headType",file]) 254return results[0]['headType'] 255 256# 257# Given a type base and modifier, return a regexp matching 258# the keywords that can be expanded in the file 259# 260defp4_keywords_regexp_for_type(base, type_mods): 261if base in("text","unicode","binary"): 262 kwords =None 263if"ko"in type_mods: 264 kwords ='Id|Header' 265elif"k"in type_mods: 266 kwords ='Id|Header|Author|Date|DateTime|Change|File|Revision' 267else: 268return None 269 pattern = r""" 270 \$ # Starts with a dollar, followed by... 271 (%s) # one of the keywords, followed by... 272 (:[^$\n]+)? # possibly an old expansion, followed by... 273 \$ # another dollar 274 """% kwords 275return pattern 276else: 277return None 278 279# 280# Given a file, return a regexp matching the possible 281# RCS keywords that will be expanded, or None for files 282# with kw expansion turned off. 283# 284defp4_keywords_regexp_for_file(file): 285if not os.path.exists(file): 286return None 287else: 288(type_base, type_mods) =split_p4_type(p4_type(file)) 289returnp4_keywords_regexp_for_type(type_base, type_mods) 290 291defsetP4ExecBit(file, mode): 292# Reopens an already open file and changes the execute bit to match 293# the execute bit setting in the passed in mode. 294 295 p4Type ="+x" 296 297if notisModeExec(mode): 298 p4Type =getP4OpenedType(file) 299 p4Type = re.sub('^([cku]?)x(.*)','\\1\\2', p4Type) 300 p4Type = re.sub('(.*?\+.*?)x(.*?)','\\1\\2', p4Type) 301if p4Type[-1] =="+": 302 p4Type = p4Type[0:-1] 303 304p4_reopen(p4Type,file) 305 306defgetP4OpenedType(file): 307# Returns the perforce file type for the given file. 308 309 result =p4_read_pipe(["opened",wildcard_encode(file)]) 310 match = re.match(".*\((.+)\)\r?$", result) 311if match: 312return match.group(1) 313else: 314die("Could not determine file type for%s(result: '%s')"% (file, result)) 315 316# Return the set of all p4 labels 317defgetP4Labels(depotPaths): 318 labels =set() 319ifisinstance(depotPaths,basestring): 320 depotPaths = [depotPaths] 321 322for l inp4CmdList(["labels"] + ["%s..."% p for p in depotPaths]): 323 label = l['label'] 324 labels.add(label) 325 326return labels 327 328# Return the set of all git tags 329defgetGitTags(): 330 gitTags =set() 331for line inread_pipe_lines(["git","tag"]): 332 tag = line.strip() 333 gitTags.add(tag) 334return gitTags 335 336defdiffTreePattern(): 337# This is a simple generator for the diff tree regex pattern. This could be 338# a class variable if this and parseDiffTreeEntry were a part of a class. 339 pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)') 340while True: 341yield pattern 342 343defparseDiffTreeEntry(entry): 344"""Parses a single diff tree entry into its component elements. 345 346 See git-diff-tree(1) manpage for details about the format of the diff 347 output. This method returns a dictionary with the following elements: 348 349 src_mode - The mode of the source file 350 dst_mode - The mode of the destination file 351 src_sha1 - The sha1 for the source file 352 dst_sha1 - The sha1 fr the destination file 353 status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc) 354 status_score - The score for the status (applicable for 'C' and 'R' 355 statuses). This is None if there is no score. 356 src - The path for the source file. 357 dst - The path for the destination file. This is only present for 358 copy or renames. If it is not present, this is None. 359 360 If the pattern is not matched, None is returned.""" 361 362 match =diffTreePattern().next().match(entry) 363if match: 364return{ 365'src_mode': match.group(1), 366'dst_mode': match.group(2), 367'src_sha1': match.group(3), 368'dst_sha1': match.group(4), 369'status': match.group(5), 370'status_score': match.group(6), 371'src': match.group(7), 372'dst': match.group(10) 373} 374return None 375 376defisModeExec(mode): 377# Returns True if the given git mode represents an executable file, 378# otherwise False. 379return mode[-3:] =="755" 380 381defisModeExecChanged(src_mode, dst_mode): 382returnisModeExec(src_mode) !=isModeExec(dst_mode) 383 384defp4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None): 385 386ifisinstance(cmd,basestring): 387 cmd ="-G "+ cmd 388 expand =True 389else: 390 cmd = ["-G"] + cmd 391 expand =False 392 393 cmd =p4_build_cmd(cmd) 394if verbose: 395 sys.stderr.write("Opening pipe:%s\n"%str(cmd)) 396 397# Use a temporary file to avoid deadlocks without 398# subprocess.communicate(), which would put another copy 399# of stdout into memory. 400 stdin_file =None 401if stdin is not None: 402 stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode) 403ifisinstance(stdin,basestring): 404 stdin_file.write(stdin) 405else: 406for i in stdin: 407 stdin_file.write(i +'\n') 408 stdin_file.flush() 409 stdin_file.seek(0) 410 411 p4 = subprocess.Popen(cmd, 412 shell=expand, 413 stdin=stdin_file, 414 stdout=subprocess.PIPE) 415 416 result = [] 417try: 418while True: 419 entry = marshal.load(p4.stdout) 420if cb is not None: 421cb(entry) 422else: 423 result.append(entry) 424exceptEOFError: 425pass 426 exitCode = p4.wait() 427if exitCode !=0: 428 entry = {} 429 entry["p4ExitCode"] = exitCode 430 result.append(entry) 431 432return result 433 434defp4Cmd(cmd): 435list=p4CmdList(cmd) 436 result = {} 437for entry inlist: 438 result.update(entry) 439return result; 440 441defp4Where(depotPath): 442if not depotPath.endswith("/"): 443 depotPath +="/" 444 depotPath = depotPath +"..." 445 outputList =p4CmdList(["where", depotPath]) 446 output =None 447for entry in outputList: 448if"depotFile"in entry: 449if entry["depotFile"] == depotPath: 450 output = entry 451break 452elif"data"in entry: 453 data = entry.get("data") 454 space = data.find(" ") 455if data[:space] == depotPath: 456 output = entry 457break 458if output ==None: 459return"" 460if output["code"] =="error": 461return"" 462 clientPath ="" 463if"path"in output: 464 clientPath = output.get("path") 465elif"data"in output: 466 data = output.get("data") 467 lastSpace = data.rfind(" ") 468 clientPath = data[lastSpace +1:] 469 470if clientPath.endswith("..."): 471 clientPath = clientPath[:-3] 472return clientPath 473 474defcurrentGitBranch(): 475returnread_pipe("git name-rev HEAD").split(" ")[1].strip() 476 477defisValidGitDir(path): 478if(os.path.exists(path +"/HEAD") 479and os.path.exists(path +"/refs")and os.path.exists(path +"/objects")): 480return True; 481return False 482 483defparseRevision(ref): 484returnread_pipe("git rev-parse%s"% ref).strip() 485 486defbranchExists(ref): 487 rev =read_pipe(["git","rev-parse","-q","--verify", ref], 488 ignore_error=True) 489returnlen(rev) >0 490 491defextractLogMessageFromGitCommit(commit): 492 logMessage ="" 493 494## fixme: title is first line of commit, not 1st paragraph. 495 foundTitle =False 496for log inread_pipe_lines("git cat-file commit%s"% commit): 497if not foundTitle: 498iflen(log) ==1: 499 foundTitle =True 500continue 501 502 logMessage += log 503return logMessage 504 505defextractSettingsGitLog(log): 506 values = {} 507for line in log.split("\n"): 508 line = line.strip() 509 m = re.search(r"^ *\[git-p4: (.*)\]$", line) 510if not m: 511continue 512 513 assignments = m.group(1).split(':') 514for a in assignments: 515 vals = a.split('=') 516 key = vals[0].strip() 517 val = ('='.join(vals[1:])).strip() 518if val.endswith('\"')and val.startswith('"'): 519 val = val[1:-1] 520 521 values[key] = val 522 523 paths = values.get("depot-paths") 524if not paths: 525 paths = values.get("depot-path") 526if paths: 527 values['depot-paths'] = paths.split(',') 528return values 529 530defgitBranchExists(branch): 531 proc = subprocess.Popen(["git","rev-parse", branch], 532 stderr=subprocess.PIPE, stdout=subprocess.PIPE); 533return proc.wait() ==0; 534 535_gitConfig = {} 536defgitConfig(key, args =None):# set args to "--bool", for instance 537if not _gitConfig.has_key(key): 538 argsFilter ="" 539if args !=None: 540 argsFilter ="%s"% args 541 cmd ="git config%s%s"% (argsFilter, key) 542 _gitConfig[key] =read_pipe(cmd, ignore_error=True).strip() 543return _gitConfig[key] 544 545defgitConfigList(key): 546if not _gitConfig.has_key(key): 547 _gitConfig[key] =read_pipe("git config --get-all%s"% key, ignore_error=True).strip().split(os.linesep) 548return _gitConfig[key] 549 550defp4BranchesInGit(branchesAreInRemotes=True): 551"""Find all the branches whose names start with "p4/", looking 552 in remotes or heads as specified by the argument. Return 553 a dictionary of{ branch: revision }for each one found. 554 The branch names are the short names, without any 555 "p4/" prefix.""" 556 557 branches = {} 558 559 cmdline ="git rev-parse --symbolic " 560if branchesAreInRemotes: 561 cmdline +="--remotes" 562else: 563 cmdline +="--branches" 564 565for line inread_pipe_lines(cmdline): 566 line = line.strip() 567 568# only import to p4/ 569if not line.startswith('p4/'): 570continue 571# special symbolic ref to p4/master 572if line =="p4/HEAD": 573continue 574 575# strip off p4/ prefix 576 branch = line[len("p4/"):] 577 578 branches[branch] =parseRevision(line) 579 580return branches 581 582defbranch_exists(branch): 583"""Make sure that the given ref name really exists.""" 584 585 cmd = ["git","rev-parse","--symbolic","--verify", branch ] 586 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 587 out, _ = p.communicate() 588if p.returncode: 589return False 590# expect exactly one line of output: the branch name 591return out.rstrip() == branch 592 593deffindUpstreamBranchPoint(head ="HEAD"): 594 branches =p4BranchesInGit() 595# map from depot-path to branch name 596 branchByDepotPath = {} 597for branch in branches.keys(): 598 tip = branches[branch] 599 log =extractLogMessageFromGitCommit(tip) 600 settings =extractSettingsGitLog(log) 601if settings.has_key("depot-paths"): 602 paths =",".join(settings["depot-paths"]) 603 branchByDepotPath[paths] ="remotes/p4/"+ branch 604 605 settings =None 606 parent =0 607while parent <65535: 608 commit = head +"~%s"% parent 609 log =extractLogMessageFromGitCommit(commit) 610 settings =extractSettingsGitLog(log) 611if settings.has_key("depot-paths"): 612 paths =",".join(settings["depot-paths"]) 613if branchByDepotPath.has_key(paths): 614return[branchByDepotPath[paths], settings] 615 616 parent = parent +1 617 618return["", settings] 619 620defcreateOrUpdateBranchesFromOrigin(localRefPrefix ="refs/remotes/p4/", silent=True): 621if not silent: 622print("Creating/updating branch(es) in%sbased on origin branch(es)" 623% localRefPrefix) 624 625 originPrefix ="origin/p4/" 626 627for line inread_pipe_lines("git rev-parse --symbolic --remotes"): 628 line = line.strip() 629if(not line.startswith(originPrefix))or line.endswith("HEAD"): 630continue 631 632 headName = line[len(originPrefix):] 633 remoteHead = localRefPrefix + headName 634 originHead = line 635 636 original =extractSettingsGitLog(extractLogMessageFromGitCommit(originHead)) 637if(not original.has_key('depot-paths') 638or not original.has_key('change')): 639continue 640 641 update =False 642if notgitBranchExists(remoteHead): 643if verbose: 644print"creating%s"% remoteHead 645 update =True 646else: 647 settings =extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead)) 648if settings.has_key('change') >0: 649if settings['depot-paths'] == original['depot-paths']: 650 originP4Change =int(original['change']) 651 p4Change =int(settings['change']) 652if originP4Change > p4Change: 653print("%s(%s) is newer than%s(%s). " 654"Updating p4 branch from origin." 655% (originHead, originP4Change, 656 remoteHead, p4Change)) 657 update =True 658else: 659print("Ignoring:%swas imported from%swhile " 660"%swas imported from%s" 661% (originHead,','.join(original['depot-paths']), 662 remoteHead,','.join(settings['depot-paths']))) 663 664if update: 665system("git update-ref%s %s"% (remoteHead, originHead)) 666 667deforiginP4BranchesExist(): 668returngitBranchExists("origin")orgitBranchExists("origin/p4")orgitBranchExists("origin/p4/master") 669 670defp4ChangesForPaths(depotPaths, changeRange): 671assert depotPaths 672 cmd = ['changes'] 673for p in depotPaths: 674 cmd += ["%s...%s"% (p, changeRange)] 675 output =p4_read_pipe_lines(cmd) 676 677 changes = {} 678for line in output: 679 changeNum =int(line.split(" ")[1]) 680 changes[changeNum] =True 681 682 changelist = changes.keys() 683 changelist.sort() 684return changelist 685 686defp4PathStartsWith(path, prefix): 687# This method tries to remedy a potential mixed-case issue: 688# 689# If UserA adds //depot/DirA/file1 690# and UserB adds //depot/dira/file2 691# 692# we may or may not have a problem. If you have core.ignorecase=true, 693# we treat DirA and dira as the same directory 694 ignorecase =gitConfig("core.ignorecase","--bool") =="true" 695if ignorecase: 696return path.lower().startswith(prefix.lower()) 697return path.startswith(prefix) 698 699defgetClientSpec(): 700"""Look at the p4 client spec, create a View() object that contains 701 all the mappings, and return it.""" 702 703 specList =p4CmdList("client -o") 704iflen(specList) !=1: 705die('Output from "client -o" is%dlines, expecting 1'% 706len(specList)) 707 708# dictionary of all client parameters 709 entry = specList[0] 710 711# just the keys that start with "View" 712 view_keys = [ k for k in entry.keys()if k.startswith("View") ] 713 714# hold this new View 715 view =View() 716 717# append the lines, in order, to the view 718for view_num inrange(len(view_keys)): 719 k ="View%d"% view_num 720if k not in view_keys: 721die("Expected view key%smissing"% k) 722 view.append(entry[k]) 723 724return view 725 726defgetClientRoot(): 727"""Grab the client directory.""" 728 729 output =p4CmdList("client -o") 730iflen(output) !=1: 731die('Output from "client -o" is%dlines, expecting 1'%len(output)) 732 733 entry = output[0] 734if"Root"not in entry: 735die('Client has no "Root"') 736 737return entry["Root"] 738 739# 740# P4 wildcards are not allowed in filenames. P4 complains 741# if you simply add them, but you can force it with "-f", in 742# which case it translates them into %xx encoding internally. 743# 744defwildcard_decode(path): 745# Search for and fix just these four characters. Do % last so 746# that fixing it does not inadvertently create new %-escapes. 747# Cannot have * in a filename in windows; untested as to 748# what p4 would do in such a case. 749if not platform.system() =="Windows": 750 path = path.replace("%2A","*") 751 path = path.replace("%23","#") \ 752.replace("%40","@") \ 753.replace("%25","%") 754return path 755 756defwildcard_encode(path): 757# do % first to avoid double-encoding the %s introduced here 758 path = path.replace("%","%25") \ 759.replace("*","%2A") \ 760.replace("#","%23") \ 761.replace("@","%40") 762return path 763 764defwildcard_present(path): 765return path.translate(None,"*#@%") != path 766 767class Command: 768def__init__(self): 769 self.usage ="usage: %prog [options]" 770 self.needsGit =True 771 self.verbose =False 772 773class P4UserMap: 774def__init__(self): 775 self.userMapFromPerforceServer =False 776 self.myP4UserId =None 777 778defp4UserId(self): 779if self.myP4UserId: 780return self.myP4UserId 781 782 results =p4CmdList("user -o") 783for r in results: 784if r.has_key('User'): 785 self.myP4UserId = r['User'] 786return r['User'] 787die("Could not find your p4 user id") 788 789defp4UserIsMe(self, p4User): 790# return True if the given p4 user is actually me 791 me = self.p4UserId() 792if not p4User or p4User != me: 793return False 794else: 795return True 796 797defgetUserCacheFilename(self): 798 home = os.environ.get("HOME", os.environ.get("USERPROFILE")) 799return home +"/.gitp4-usercache.txt" 800 801defgetUserMapFromPerforceServer(self): 802if self.userMapFromPerforceServer: 803return 804 self.users = {} 805 self.emails = {} 806 807for output inp4CmdList("users"): 808if not output.has_key("User"): 809continue 810 self.users[output["User"]] = output["FullName"] +" <"+ output["Email"] +">" 811 self.emails[output["Email"]] = output["User"] 812 813 814 s ='' 815for(key, val)in self.users.items(): 816 s +="%s\t%s\n"% (key.expandtabs(1), val.expandtabs(1)) 817 818open(self.getUserCacheFilename(),"wb").write(s) 819 self.userMapFromPerforceServer =True 820 821defloadUserMapFromCache(self): 822 self.users = {} 823 self.userMapFromPerforceServer =False 824try: 825 cache =open(self.getUserCacheFilename(),"rb") 826 lines = cache.readlines() 827 cache.close() 828for line in lines: 829 entry = line.strip().split("\t") 830 self.users[entry[0]] = entry[1] 831exceptIOError: 832 self.getUserMapFromPerforceServer() 833 834classP4Debug(Command): 835def__init__(self): 836 Command.__init__(self) 837 self.options = [] 838 self.description ="A tool to debug the output of p4 -G." 839 self.needsGit =False 840 841defrun(self, args): 842 j =0 843for output inp4CmdList(args): 844print'Element:%d'% j 845 j +=1 846print output 847return True 848 849classP4RollBack(Command): 850def__init__(self): 851 Command.__init__(self) 852 self.options = [ 853 optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true") 854] 855 self.description ="A tool to debug the multi-branch import. Don't use :)" 856 self.rollbackLocalBranches =False 857 858defrun(self, args): 859iflen(args) !=1: 860return False 861 maxChange =int(args[0]) 862 863if"p4ExitCode"inp4Cmd("changes -m 1"): 864die("Problems executing p4"); 865 866if self.rollbackLocalBranches: 867 refPrefix ="refs/heads/" 868 lines =read_pipe_lines("git rev-parse --symbolic --branches") 869else: 870 refPrefix ="refs/remotes/" 871 lines =read_pipe_lines("git rev-parse --symbolic --remotes") 872 873for line in lines: 874if self.rollbackLocalBranches or(line.startswith("p4/")and line !="p4/HEAD\n"): 875 line = line.strip() 876 ref = refPrefix + line 877 log =extractLogMessageFromGitCommit(ref) 878 settings =extractSettingsGitLog(log) 879 880 depotPaths = settings['depot-paths'] 881 change = settings['change'] 882 883 changed =False 884 885iflen(p4Cmd("changes -m 1 "+' '.join(['%s...@%s'% (p, maxChange) 886for p in depotPaths]))) ==0: 887print"Branch%sdid not exist at change%s, deleting."% (ref, maxChange) 888system("git update-ref -d%s`git rev-parse%s`"% (ref, ref)) 889continue 890 891while change andint(change) > maxChange: 892 changed =True 893if self.verbose: 894print"%sis at%s; rewinding towards%s"% (ref, change, maxChange) 895system("git update-ref%s\"%s^\""% (ref, ref)) 896 log =extractLogMessageFromGitCommit(ref) 897 settings =extractSettingsGitLog(log) 898 899 900 depotPaths = settings['depot-paths'] 901 change = settings['change'] 902 903if changed: 904print"%srewound to%s"% (ref, change) 905 906return True 907 908classP4Submit(Command, P4UserMap): 909 910 conflict_behavior_choices = ("ask","skip","quit") 911 912def__init__(self): 913 Command.__init__(self) 914 P4UserMap.__init__(self) 915 self.options = [ 916 optparse.make_option("--origin", dest="origin"), 917 optparse.make_option("-M", dest="detectRenames", action="store_true"), 918# preserve the user, requires relevant p4 permissions 919 optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"), 920 optparse.make_option("--export-labels", dest="exportLabels", action="store_true"), 921 optparse.make_option("--dry-run","-n", dest="dry_run", action="store_true"), 922 optparse.make_option("--prepare-p4-only", dest="prepare_p4_only", action="store_true"), 923 optparse.make_option("--conflict", dest="conflict_behavior", 924 choices=self.conflict_behavior_choices) 925] 926 self.description ="Submit changes from git to the perforce depot." 927 self.usage +=" [name of git branch to submit into perforce depot]" 928 self.origin ="" 929 self.detectRenames =False 930 self.preserveUser =gitConfig("git-p4.preserveUser").lower() =="true" 931 self.dry_run =False 932 self.prepare_p4_only =False 933 self.conflict_behavior =None 934 self.isWindows = (platform.system() =="Windows") 935 self.exportLabels =False 936 self.p4HasMoveCommand =p4_has_move_command() 937 938defcheck(self): 939iflen(p4CmdList("opened ...")) >0: 940die("You have files opened with perforce! Close them before starting the sync.") 941 942defseparate_jobs_from_description(self, message): 943"""Extract and return a possible Jobs field in the commit 944 message. It goes into a separate section in the p4 change 945 specification. 946 947 A jobs line starts with "Jobs:" and looks like a new field 948 in a form. Values are white-space separated on the same 949 line or on following lines that start with a tab. 950 951 This does not parse and extract the full git commit message 952 like a p4 form. It just sees the Jobs: line as a marker 953 to pass everything from then on directly into the p4 form, 954 but outside the description section. 955 956 Return a tuple (stripped log message, jobs string).""" 957 958 m = re.search(r'^Jobs:', message, re.MULTILINE) 959if m is None: 960return(message,None) 961 962 jobtext = message[m.start():] 963 stripped_message = message[:m.start()].rstrip() 964return(stripped_message, jobtext) 965 966defprepareLogMessage(self, template, message, jobs): 967"""Edits the template returned from "p4 change -o" to insert 968 the message in the Description field, and the jobs text in 969 the Jobs field.""" 970 result ="" 971 972 inDescriptionSection =False 973 974for line in template.split("\n"): 975if line.startswith("#"): 976 result += line +"\n" 977continue 978 979if inDescriptionSection: 980if line.startswith("Files:")or line.startswith("Jobs:"): 981 inDescriptionSection =False 982# insert Jobs section 983if jobs: 984 result += jobs +"\n" 985else: 986continue 987else: 988if line.startswith("Description:"): 989 inDescriptionSection =True 990 line +="\n" 991for messageLine in message.split("\n"): 992 line +="\t"+ messageLine +"\n" 993 994 result += line +"\n" 995 996return result 997 998defpatchRCSKeywords(self,file, pattern): 999# Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern1000(handle, outFileName) = tempfile.mkstemp(dir='.')1001try:1002 outFile = os.fdopen(handle,"w+")1003 inFile =open(file,"r")1004 regexp = re.compile(pattern, re.VERBOSE)1005for line in inFile.readlines():1006 line = regexp.sub(r'$\1$', line)1007 outFile.write(line)1008 inFile.close()1009 outFile.close()1010# Forcibly overwrite the original file1011 os.unlink(file)1012 shutil.move(outFileName,file)1013except:1014# cleanup our temporary file1015 os.unlink(outFileName)1016print"Failed to strip RCS keywords in%s"%file1017raise10181019print"Patched up RCS keywords in%s"%file10201021defp4UserForCommit(self,id):1022# Return the tuple (perforce user,git email) for a given git commit id1023 self.getUserMapFromPerforceServer()1024 gitEmail =read_pipe("git log --max-count=1 --format='%%ae'%s"%id)1025 gitEmail = gitEmail.strip()1026if not self.emails.has_key(gitEmail):1027return(None,gitEmail)1028else:1029return(self.emails[gitEmail],gitEmail)10301031defcheckValidP4Users(self,commits):1032# check if any git authors cannot be mapped to p4 users1033foridin commits:1034(user,email) = self.p4UserForCommit(id)1035if not user:1036 msg ="Cannot find p4 user for email%sin commit%s."% (email,id)1037ifgitConfig('git-p4.allowMissingP4Users').lower() =="true":1038print"%s"% msg1039else:1040die("Error:%s\nSet git-p4.allowMissingP4Users to true to allow this."% msg)10411042deflastP4Changelist(self):1043# Get back the last changelist number submitted in this client spec. This1044# then gets used to patch up the username in the change. If the same1045# client spec is being used by multiple processes then this might go1046# wrong.1047 results =p4CmdList("client -o")# find the current client1048 client =None1049for r in results:1050if r.has_key('Client'):1051 client = r['Client']1052break1053if not client:1054die("could not get client spec")1055 results =p4CmdList(["changes","-c", client,"-m","1"])1056for r in results:1057if r.has_key('change'):1058return r['change']1059die("Could not get changelist number for last submit - cannot patch up user details")10601061defmodifyChangelistUser(self, changelist, newUser):1062# fixup the user field of a changelist after it has been submitted.1063 changes =p4CmdList("change -o%s"% changelist)1064iflen(changes) !=1:1065die("Bad output from p4 change modifying%sto user%s"%1066(changelist, newUser))10671068 c = changes[0]1069if c['User'] == newUser:return# nothing to do1070 c['User'] = newUser1071input= marshal.dumps(c)10721073 result =p4CmdList("change -f -i", stdin=input)1074for r in result:1075if r.has_key('code'):1076if r['code'] =='error':1077die("Could not modify user field of changelist%sto%s:%s"% (changelist, newUser, r['data']))1078if r.has_key('data'):1079print("Updated user field for changelist%sto%s"% (changelist, newUser))1080return1081die("Could not modify user field of changelist%sto%s"% (changelist, newUser))10821083defcanChangeChangelists(self):1084# check to see if we have p4 admin or super-user permissions, either of1085# which are required to modify changelists.1086 results =p4CmdList(["protects", self.depotPath])1087for r in results:1088if r.has_key('perm'):1089if r['perm'] =='admin':1090return11091if r['perm'] =='super':1092return11093return010941095defprepareSubmitTemplate(self):1096"""Run "p4 change -o" to grab a change specification template.1097 This does not use "p4 -G", as it is nice to keep the submission1098 template in original order, since a human might edit it.10991100 Remove lines in the Files section that show changes to files1101 outside the depot path we're committing into."""11021103 template =""1104 inFilesSection =False1105for line inp4_read_pipe_lines(['change','-o']):1106if line.endswith("\r\n"):1107 line = line[:-2] +"\n"1108if inFilesSection:1109if line.startswith("\t"):1110# path starts and ends with a tab1111 path = line[1:]1112 lastTab = path.rfind("\t")1113if lastTab != -1:1114 path = path[:lastTab]1115if notp4PathStartsWith(path, self.depotPath):1116continue1117else:1118 inFilesSection =False1119else:1120if line.startswith("Files:"):1121 inFilesSection =True11221123 template += line11241125return template11261127defedit_template(self, template_file):1128"""Invoke the editor to let the user change the submission1129 message. Return true if okay to continue with the submit."""11301131# if configured to skip the editing part, just submit1132ifgitConfig("git-p4.skipSubmitEdit") =="true":1133return True11341135# look at the modification time, to check later if the user saved1136# the file1137 mtime = os.stat(template_file).st_mtime11381139# invoke the editor1140if os.environ.has_key("P4EDITOR")and(os.environ.get("P4EDITOR") !=""):1141 editor = os.environ.get("P4EDITOR")1142else:1143 editor =read_pipe("git var GIT_EDITOR").strip()1144system(editor +" "+ template_file)11451146# If the file was not saved, prompt to see if this patch should1147# be skipped. But skip this verification step if configured so.1148ifgitConfig("git-p4.skipSubmitEditCheck") =="true":1149return True11501151# modification time updated means user saved the file1152if os.stat(template_file).st_mtime > mtime:1153return True11541155while True:1156 response =raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")1157if response =='y':1158return True1159if response =='n':1160return False11611162defapplyCommit(self,id):1163"""Apply one commit, return True if it succeeded."""11641165print"Applying",read_pipe(["git","show","-s",1166"--format=format:%h%s",id])11671168(p4User, gitEmail) = self.p4UserForCommit(id)11691170 diff =read_pipe_lines("git diff-tree -r%s\"%s^\" \"%s\""% (self.diffOpts,id,id))1171 filesToAdd =set()1172 filesToDelete =set()1173 editedFiles =set()1174 pureRenameCopy =set()1175 filesToChangeExecBit = {}11761177for line in diff:1178 diff =parseDiffTreeEntry(line)1179 modifier = diff['status']1180 path = diff['src']1181if modifier =="M":1182p4_edit(path)1183ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1184 filesToChangeExecBit[path] = diff['dst_mode']1185 editedFiles.add(path)1186elif modifier =="A":1187 filesToAdd.add(path)1188 filesToChangeExecBit[path] = diff['dst_mode']1189if path in filesToDelete:1190 filesToDelete.remove(path)1191elif modifier =="D":1192 filesToDelete.add(path)1193if path in filesToAdd:1194 filesToAdd.remove(path)1195elif modifier =="C":1196 src, dest = diff['src'], diff['dst']1197p4_integrate(src, dest)1198 pureRenameCopy.add(dest)1199if diff['src_sha1'] != diff['dst_sha1']:1200p4_edit(dest)1201 pureRenameCopy.discard(dest)1202ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1203p4_edit(dest)1204 pureRenameCopy.discard(dest)1205 filesToChangeExecBit[dest] = diff['dst_mode']1206 os.unlink(dest)1207 editedFiles.add(dest)1208elif modifier =="R":1209 src, dest = diff['src'], diff['dst']1210if self.p4HasMoveCommand:1211p4_edit(src)# src must be open before move1212p4_move(src, dest)# opens for (move/delete, move/add)1213else:1214p4_integrate(src, dest)1215if diff['src_sha1'] != diff['dst_sha1']:1216p4_edit(dest)1217else:1218 pureRenameCopy.add(dest)1219ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1220if not self.p4HasMoveCommand:1221p4_edit(dest)# with move: already open, writable1222 filesToChangeExecBit[dest] = diff['dst_mode']1223if not self.p4HasMoveCommand:1224 os.unlink(dest)1225 filesToDelete.add(src)1226 editedFiles.add(dest)1227else:1228die("unknown modifier%sfor%s"% (modifier, path))12291230 diffcmd ="git format-patch -k --stdout\"%s^\"..\"%s\""% (id,id)1231 patchcmd = diffcmd +" | git apply "1232 tryPatchCmd = patchcmd +"--check -"1233 applyPatchCmd = patchcmd +"--check --apply -"1234 patch_succeeded =True12351236if os.system(tryPatchCmd) !=0:1237 fixed_rcs_keywords =False1238 patch_succeeded =False1239print"Unfortunately applying the change failed!"12401241# Patch failed, maybe it's just RCS keyword woes. Look through1242# the patch to see if that's possible.1243ifgitConfig("git-p4.attemptRCSCleanup","--bool") =="true":1244file=None1245 pattern =None1246 kwfiles = {}1247forfilein editedFiles | filesToDelete:1248# did this file's delta contain RCS keywords?1249 pattern =p4_keywords_regexp_for_file(file)12501251if pattern:1252# this file is a possibility...look for RCS keywords.1253 regexp = re.compile(pattern, re.VERBOSE)1254for line inread_pipe_lines(["git","diff","%s^..%s"% (id,id),file]):1255if regexp.search(line):1256if verbose:1257print"got keyword match on%sin%sin%s"% (pattern, line,file)1258 kwfiles[file] = pattern1259break12601261forfilein kwfiles:1262if verbose:1263print"zapping%swith%s"% (line,pattern)1264 self.patchRCSKeywords(file, kwfiles[file])1265 fixed_rcs_keywords =True12661267if fixed_rcs_keywords:1268print"Retrying the patch with RCS keywords cleaned up"1269if os.system(tryPatchCmd) ==0:1270 patch_succeeded =True12711272if not patch_succeeded:1273for f in editedFiles:1274p4_revert(f)1275return False12761277#1278# Apply the patch for real, and do add/delete/+x handling.1279#1280system(applyPatchCmd)12811282for f in filesToAdd:1283p4_add(f)1284for f in filesToDelete:1285p4_revert(f)1286p4_delete(f)12871288# Set/clear executable bits1289for f in filesToChangeExecBit.keys():1290 mode = filesToChangeExecBit[f]1291setP4ExecBit(f, mode)12921293#1294# Build p4 change description, starting with the contents1295# of the git commit message.1296#1297 logMessage =extractLogMessageFromGitCommit(id)1298 logMessage = logMessage.strip()1299(logMessage, jobs) = self.separate_jobs_from_description(logMessage)13001301 template = self.prepareSubmitTemplate()1302 submitTemplate = self.prepareLogMessage(template, logMessage, jobs)13031304if self.preserveUser:1305 submitTemplate +="\n######## Actual user%s, modified after commit\n"% p4User13061307if self.checkAuthorship and not self.p4UserIsMe(p4User):1308 submitTemplate +="######## git author%sdoes not match your p4 account.\n"% gitEmail1309 submitTemplate +="######## Use option --preserve-user to modify authorship.\n"1310 submitTemplate +="######## Variable git-p4.skipUserNameCheck hides this message.\n"13111312 separatorLine ="######## everything below this line is just the diff #######\n"13131314# diff1315if os.environ.has_key("P4DIFF"):1316del(os.environ["P4DIFF"])1317 diff =""1318for editedFile in editedFiles:1319 diff +=p4_read_pipe(['diff','-du',1320wildcard_encode(editedFile)])13211322# new file diff1323 newdiff =""1324for newFile in filesToAdd:1325 newdiff +="==== new file ====\n"1326 newdiff +="--- /dev/null\n"1327 newdiff +="+++%s\n"% newFile1328 f =open(newFile,"r")1329for line in f.readlines():1330 newdiff +="+"+ line1331 f.close()13321333# change description file: submitTemplate, separatorLine, diff, newdiff1334(handle, fileName) = tempfile.mkstemp()1335 tmpFile = os.fdopen(handle,"w+")1336if self.isWindows:1337 submitTemplate = submitTemplate.replace("\n","\r\n")1338 separatorLine = separatorLine.replace("\n","\r\n")1339 newdiff = newdiff.replace("\n","\r\n")1340 tmpFile.write(submitTemplate + separatorLine + diff + newdiff)1341 tmpFile.close()13421343if self.prepare_p4_only:1344#1345# Leave the p4 tree prepared, and the submit template around1346# and let the user decide what to do next1347#1348print1349print"P4 workspace prepared for submission."1350print"To submit or revert, go to client workspace"1351print" "+ self.clientPath1352print1353print"To submit, use\"p4 submit\"to write a new description,"1354print"or\"p4 submit -i%s\"to use the one prepared by" \1355"\"git p4\"."% fileName1356print"You can delete the file\"%s\"when finished."% fileName13571358if self.preserveUser and p4User and not self.p4UserIsMe(p4User):1359print"To preserve change ownership by user%s, you must\n" \1360"do\"p4 change -f <change>\"after submitting and\n" \1361"edit the User field."1362if pureRenameCopy:1363print"After submitting, renamed files must be re-synced."1364print"Invoke\"p4 sync -f\"on each of these files:"1365for f in pureRenameCopy:1366print" "+ f13671368print1369print"To revert the changes, use\"p4 revert ...\", and delete"1370print"the submit template file\"%s\""% fileName1371if filesToAdd:1372print"Since the commit adds new files, they must be deleted:"1373for f in filesToAdd:1374print" "+ f1375print1376return True13771378#1379# Let the user edit the change description, then submit it.1380#1381if self.edit_template(fileName):1382# read the edited message and submit1383 ret =True1384 tmpFile =open(fileName,"rb")1385 message = tmpFile.read()1386 tmpFile.close()1387 submitTemplate = message[:message.index(separatorLine)]1388if self.isWindows:1389 submitTemplate = submitTemplate.replace("\r\n","\n")1390p4_write_pipe(['submit','-i'], submitTemplate)13911392if self.preserveUser:1393if p4User:1394# Get last changelist number. Cannot easily get it from1395# the submit command output as the output is1396# unmarshalled.1397 changelist = self.lastP4Changelist()1398 self.modifyChangelistUser(changelist, p4User)13991400# The rename/copy happened by applying a patch that created a1401# new file. This leaves it writable, which confuses p4.1402for f in pureRenameCopy:1403p4_sync(f,"-f")14041405else:1406# skip this patch1407 ret =False1408print"Submission cancelled, undoing p4 changes."1409for f in editedFiles:1410p4_revert(f)1411for f in filesToAdd:1412p4_revert(f)1413 os.remove(f)1414for f in filesToDelete:1415p4_revert(f)14161417 os.remove(fileName)1418return ret14191420# Export git tags as p4 labels. Create a p4 label and then tag1421# with that.1422defexportGitTags(self, gitTags):1423 validLabelRegexp =gitConfig("git-p4.labelExportRegexp")1424iflen(validLabelRegexp) ==0:1425 validLabelRegexp = defaultLabelRegexp1426 m = re.compile(validLabelRegexp)14271428for name in gitTags:14291430if not m.match(name):1431if verbose:1432print"tag%sdoes not match regexp%s"% (name, validLabelRegexp)1433continue14341435# Get the p4 commit this corresponds to1436 logMessage =extractLogMessageFromGitCommit(name)1437 values =extractSettingsGitLog(logMessage)14381439if not values.has_key('change'):1440# a tag pointing to something not sent to p4; ignore1441if verbose:1442print"git tag%sdoes not give a p4 commit"% name1443continue1444else:1445 changelist = values['change']14461447# Get the tag details.1448 inHeader =True1449 isAnnotated =False1450 body = []1451for l inread_pipe_lines(["git","cat-file","-p", name]):1452 l = l.strip()1453if inHeader:1454if re.match(r'tag\s+', l):1455 isAnnotated =True1456elif re.match(r'\s*$', l):1457 inHeader =False1458continue1459else:1460 body.append(l)14611462if not isAnnotated:1463 body = ["lightweight tag imported by git p4\n"]14641465# Create the label - use the same view as the client spec we are using1466 clientSpec =getClientSpec()14671468 labelTemplate ="Label:%s\n"% name1469 labelTemplate +="Description:\n"1470for b in body:1471 labelTemplate +="\t"+ b +"\n"1472 labelTemplate +="View:\n"1473for mapping in clientSpec.mappings:1474 labelTemplate +="\t%s\n"% mapping.depot_side.path14751476if self.dry_run:1477print"Would create p4 label%sfor tag"% name1478elif self.prepare_p4_only:1479print"Not creating p4 label%sfor tag due to option" \1480" --prepare-p4-only"% name1481else:1482p4_write_pipe(["label","-i"], labelTemplate)14831484# Use the label1485p4_system(["tag","-l", name] +1486["%s@%s"% (mapping.depot_side.path, changelist)for mapping in clientSpec.mappings])14871488if verbose:1489print"created p4 label for tag%s"% name14901491defrun(self, args):1492iflen(args) ==0:1493 self.master =currentGitBranch()1494iflen(self.master) ==0or notgitBranchExists("refs/heads/%s"% self.master):1495die("Detecting current git branch failed!")1496eliflen(args) ==1:1497 self.master = args[0]1498if notbranchExists(self.master):1499die("Branch%sdoes not exist"% self.master)1500else:1501return False15021503 allowSubmit =gitConfig("git-p4.allowSubmit")1504iflen(allowSubmit) >0and not self.master in allowSubmit.split(","):1505die("%sis not in git-p4.allowSubmit"% self.master)15061507[upstream, settings] =findUpstreamBranchPoint()1508 self.depotPath = settings['depot-paths'][0]1509iflen(self.origin) ==0:1510 self.origin = upstream15111512if self.preserveUser:1513if not self.canChangeChangelists():1514die("Cannot preserve user names without p4 super-user or admin permissions")15151516# if not set from the command line, try the config file1517if self.conflict_behavior is None:1518 val =gitConfig("git-p4.conflict")1519if val:1520if val not in self.conflict_behavior_choices:1521die("Invalid value '%s' for config git-p4.conflict"% val)1522else:1523 val ="ask"1524 self.conflict_behavior = val15251526if self.verbose:1527print"Origin branch is "+ self.origin15281529iflen(self.depotPath) ==0:1530print"Internal error: cannot locate perforce depot path from existing branches"1531 sys.exit(128)15321533 self.useClientSpec =False1534ifgitConfig("git-p4.useclientspec","--bool") =="true":1535 self.useClientSpec =True1536if self.useClientSpec:1537 self.clientSpecDirs =getClientSpec()15381539if self.useClientSpec:1540# all files are relative to the client spec1541 self.clientPath =getClientRoot()1542else:1543 self.clientPath =p4Where(self.depotPath)15441545if self.clientPath =="":1546die("Error: Cannot locate perforce checkout of%sin client view"% self.depotPath)15471548print"Perforce checkout for depot path%slocated at%s"% (self.depotPath, self.clientPath)1549 self.oldWorkingDirectory = os.getcwd()15501551# ensure the clientPath exists1552 new_client_dir =False1553if not os.path.exists(self.clientPath):1554 new_client_dir =True1555 os.makedirs(self.clientPath)15561557chdir(self.clientPath)1558if self.dry_run:1559print"Would synchronize p4 checkout in%s"% self.clientPath1560else:1561print"Synchronizing p4 checkout..."1562if new_client_dir:1563# old one was destroyed, and maybe nobody told p41564p4_sync("...","-f")1565else:1566p4_sync("...")1567 self.check()15681569 commits = []1570for line inread_pipe_lines("git rev-list --no-merges%s..%s"% (self.origin, self.master)):1571 commits.append(line.strip())1572 commits.reverse()15731574if self.preserveUser or(gitConfig("git-p4.skipUserNameCheck") =="true"):1575 self.checkAuthorship =False1576else:1577 self.checkAuthorship =True15781579if self.preserveUser:1580 self.checkValidP4Users(commits)15811582#1583# Build up a set of options to be passed to diff when1584# submitting each commit to p4.1585#1586if self.detectRenames:1587# command-line -M arg1588 self.diffOpts ="-M"1589else:1590# If not explicitly set check the config variable1591 detectRenames =gitConfig("git-p4.detectRenames")15921593if detectRenames.lower() =="false"or detectRenames =="":1594 self.diffOpts =""1595elif detectRenames.lower() =="true":1596 self.diffOpts ="-M"1597else:1598 self.diffOpts ="-M%s"% detectRenames15991600# no command-line arg for -C or --find-copies-harder, just1601# config variables1602 detectCopies =gitConfig("git-p4.detectCopies")1603if detectCopies.lower() =="false"or detectCopies =="":1604pass1605elif detectCopies.lower() =="true":1606 self.diffOpts +=" -C"1607else:1608 self.diffOpts +=" -C%s"% detectCopies16091610ifgitConfig("git-p4.detectCopiesHarder","--bool") =="true":1611 self.diffOpts +=" --find-copies-harder"16121613#1614# Apply the commits, one at a time. On failure, ask if should1615# continue to try the rest of the patches, or quit.1616#1617if self.dry_run:1618print"Would apply"1619 applied = []1620 last =len(commits) -11621for i, commit inenumerate(commits):1622if self.dry_run:1623print" ",read_pipe(["git","show","-s",1624"--format=format:%h%s", commit])1625 ok =True1626else:1627 ok = self.applyCommit(commit)1628if ok:1629 applied.append(commit)1630else:1631if self.prepare_p4_only and i < last:1632print"Processing only the first commit due to option" \1633" --prepare-p4-only"1634break1635if i < last:1636 quit =False1637while True:1638# prompt for what to do, or use the option/variable1639if self.conflict_behavior =="ask":1640print"What do you want to do?"1641 response =raw_input("[s]kip this commit but apply"1642" the rest, or [q]uit? ")1643if not response:1644continue1645elif self.conflict_behavior =="skip":1646 response ="s"1647elif self.conflict_behavior =="quit":1648 response ="q"1649else:1650die("Unknown conflict_behavior '%s'"%1651 self.conflict_behavior)16521653if response[0] =="s":1654print"Skipping this commit, but applying the rest"1655break1656if response[0] =="q":1657print"Quitting"1658 quit =True1659break1660if quit:1661break16621663chdir(self.oldWorkingDirectory)16641665if self.dry_run:1666pass1667elif self.prepare_p4_only:1668pass1669eliflen(commits) ==len(applied):1670print"All commits applied!"16711672 sync =P4Sync()1673 sync.run([])16741675 rebase =P4Rebase()1676 rebase.rebase()16771678else:1679iflen(applied) ==0:1680print"No commits applied."1681else:1682print"Applied only the commits marked with '*':"1683for c in commits:1684if c in applied:1685 star ="*"1686else:1687 star =" "1688print star,read_pipe(["git","show","-s",1689"--format=format:%h%s", c])1690print"You will have to do 'git p4 sync' and rebase."16911692ifgitConfig("git-p4.exportLabels","--bool") =="true":1693 self.exportLabels =True16941695if self.exportLabels:1696 p4Labels =getP4Labels(self.depotPath)1697 gitTags =getGitTags()16981699 missingGitTags = gitTags - p4Labels1700 self.exportGitTags(missingGitTags)17011702# exit with error unless everything applied perfecly1703iflen(commits) !=len(applied):1704 sys.exit(1)17051706return True17071708classView(object):1709"""Represent a p4 view ("p4 help views"), and map files in a1710 repo according to the view."""17111712classPath(object):1713"""A depot or client path, possibly containing wildcards.1714 The only one supported is ... at the end, currently.1715 Initialize with the full path, with //depot or //client."""17161717def__init__(self, path, is_depot):1718 self.path = path1719 self.is_depot = is_depot1720 self.find_wildcards()1721# remember the prefix bit, useful for relative mappings1722 m = re.match("(//[^/]+/)", self.path)1723if not m:1724die("Path%sdoes not start with //prefix/"% self.path)1725 prefix = m.group(1)1726if not self.is_depot:1727# strip //client/ on client paths1728 self.path = self.path[len(prefix):]17291730deffind_wildcards(self):1731"""Make sure wildcards are valid, and set up internal1732 variables."""17331734 self.ends_triple_dot =False1735# There are three wildcards allowed in p4 views1736# (see "p4 help views"). This code knows how to1737# handle "..." (only at the end), but cannot deal with1738# "%%n" or "*". Only check the depot_side, as p4 should1739# validate that the client_side matches too.1740if re.search(r'%%[1-9]', self.path):1741die("Can't handle%%n wildcards in view:%s"% self.path)1742if self.path.find("*") >=0:1743die("Can't handle * wildcards in view:%s"% self.path)1744 triple_dot_index = self.path.find("...")1745if triple_dot_index >=0:1746if triple_dot_index !=len(self.path) -3:1747die("Can handle only single ... wildcard, at end:%s"%1748 self.path)1749 self.ends_triple_dot =True17501751defensure_compatible(self, other_path):1752"""Make sure the wildcards agree."""1753if self.ends_triple_dot != other_path.ends_triple_dot:1754die("Both paths must end with ... if either does;\n"+1755"paths:%s %s"% (self.path, other_path.path))17561757defmatch_wildcards(self, test_path):1758"""See if this test_path matches us, and fill in the value1759 of the wildcards if so. Returns a tuple of1760 (True|False, wildcards[]). For now, only the ... at end1761 is supported, so at most one wildcard."""1762if self.ends_triple_dot:1763 dotless = self.path[:-3]1764if test_path.startswith(dotless):1765 wildcard = test_path[len(dotless):]1766return(True, [ wildcard ])1767else:1768if test_path == self.path:1769return(True, [])1770return(False, [])17711772defmatch(self, test_path):1773"""Just return if it matches; don't bother with the wildcards."""1774 b, _ = self.match_wildcards(test_path)1775return b17761777deffill_in_wildcards(self, wildcards):1778"""Return the relative path, with the wildcards filled in1779 if there are any."""1780if self.ends_triple_dot:1781return self.path[:-3] + wildcards[0]1782else:1783return self.path17841785classMapping(object):1786def__init__(self, depot_side, client_side, overlay, exclude):1787# depot_side is without the trailing /... if it had one1788 self.depot_side = View.Path(depot_side, is_depot=True)1789 self.client_side = View.Path(client_side, is_depot=False)1790 self.overlay = overlay # started with "+"1791 self.exclude = exclude # started with "-"1792assert not(self.overlay and self.exclude)1793 self.depot_side.ensure_compatible(self.client_side)17941795def__str__(self):1796 c =" "1797if self.overlay:1798 c ="+"1799if self.exclude:1800 c ="-"1801return"View.Mapping:%s%s->%s"% \1802(c, self.depot_side.path, self.client_side.path)18031804defmap_depot_to_client(self, depot_path):1805"""Calculate the client path if using this mapping on the1806 given depot path; does not consider the effect of other1807 mappings in a view. Even excluded mappings are returned."""1808 matches, wildcards = self.depot_side.match_wildcards(depot_path)1809if not matches:1810return""1811 client_path = self.client_side.fill_in_wildcards(wildcards)1812return client_path18131814#1815# View methods1816#1817def__init__(self):1818 self.mappings = []18191820defappend(self, view_line):1821"""Parse a view line, splitting it into depot and client1822 sides. Append to self.mappings, preserving order."""18231824# Split the view line into exactly two words. P4 enforces1825# structure on these lines that simplifies this quite a bit.1826#1827# Either or both words may be double-quoted.1828# Single quotes do not matter.1829# Double-quote marks cannot occur inside the words.1830# A + or - prefix is also inside the quotes.1831# There are no quotes unless they contain a space.1832# The line is already white-space stripped.1833# The two words are separated by a single space.1834#1835if view_line[0] =='"':1836# First word is double quoted. Find its end.1837 close_quote_index = view_line.find('"',1)1838if close_quote_index <=0:1839die("No first-word closing quote found:%s"% view_line)1840 depot_side = view_line[1:close_quote_index]1841# skip closing quote and space1842 rhs_index = close_quote_index +1+11843else:1844 space_index = view_line.find(" ")1845if space_index <=0:1846die("No word-splitting space found:%s"% view_line)1847 depot_side = view_line[0:space_index]1848 rhs_index = space_index +118491850if view_line[rhs_index] =='"':1851# Second word is double quoted. Make sure there is a1852# double quote at the end too.1853if not view_line.endswith('"'):1854die("View line with rhs quote should end with one:%s"%1855 view_line)1856# skip the quotes1857 client_side = view_line[rhs_index+1:-1]1858else:1859 client_side = view_line[rhs_index:]18601861# prefix + means overlay on previous mapping1862 overlay =False1863if depot_side.startswith("+"):1864 overlay =True1865 depot_side = depot_side[1:]18661867# prefix - means exclude this path1868 exclude =False1869if depot_side.startswith("-"):1870 exclude =True1871 depot_side = depot_side[1:]18721873 m = View.Mapping(depot_side, client_side, overlay, exclude)1874 self.mappings.append(m)18751876defmap_in_client(self, depot_path):1877"""Return the relative location in the client where this1878 depot file should live. Returns "" if the file should1879 not be mapped in the client."""18801881 paths_filled = []1882 client_path =""18831884# look at later entries first1885for m in self.mappings[::-1]:18861887# see where will this path end up in the client1888 p = m.map_depot_to_client(depot_path)18891890if p =="":1891# Depot path does not belong in client. Must remember1892# this, as previous items should not cause files to1893# exist in this path either. Remember that the list is1894# being walked from the end, which has higher precedence.1895# Overlap mappings do not exclude previous mappings.1896if not m.overlay:1897 paths_filled.append(m.client_side)18981899else:1900# This mapping matched; no need to search any further.1901# But, the mapping could be rejected if the client path1902# has already been claimed by an earlier mapping (i.e.1903# one later in the list, which we are walking backwards).1904 already_mapped_in_client =False1905for f in paths_filled:1906# this is View.Path.match1907if f.match(p):1908 already_mapped_in_client =True1909break1910if not already_mapped_in_client:1911# Include this file, unless it is from a line that1912# explicitly said to exclude it.1913if not m.exclude:1914 client_path = p19151916# a match, even if rejected, always stops the search1917break19181919return client_path19201921classP4Sync(Command, P4UserMap):1922 delete_actions = ("delete","move/delete","purge")19231924def__init__(self):1925 Command.__init__(self)1926 P4UserMap.__init__(self)1927 self.options = [1928 optparse.make_option("--branch", dest="branch"),1929 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),1930 optparse.make_option("--changesfile", dest="changesFile"),1931 optparse.make_option("--silent", dest="silent", action="store_true"),1932 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),1933 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),1934 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",1935help="Import into refs/heads/ , not refs/remotes"),1936 optparse.make_option("--max-changes", dest="maxChanges"),1937 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',1938help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),1939 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',1940help="Only sync files that are included in the Perforce Client Spec")1941]1942 self.description ="""Imports from Perforce into a git repository.\n1943 example:1944 //depot/my/project/ -- to import the current head1945 //depot/my/project/@all -- to import everything1946 //depot/my/project/@1,6 -- to import only from revision 1 to 619471948 (a ... is not needed in the path p4 specification, it's added implicitly)"""19491950 self.usage +=" //depot/path[@revRange]"1951 self.silent =False1952 self.createdBranches =set()1953 self.committedChanges =set()1954 self.branch =""1955 self.detectBranches =False1956 self.detectLabels =False1957 self.importLabels =False1958 self.changesFile =""1959 self.syncWithOrigin =True1960 self.importIntoRemotes =True1961 self.maxChanges =""1962 self.isWindows = (platform.system() =="Windows")1963 self.keepRepoPath =False1964 self.depotPaths =None1965 self.p4BranchesInGit = []1966 self.cloneExclude = []1967 self.useClientSpec =False1968 self.useClientSpec_from_options =False1969 self.clientSpecDirs =None1970 self.tempBranches = []1971 self.tempBranchLocation ="git-p4-tmp"19721973ifgitConfig("git-p4.syncFromOrigin") =="false":1974 self.syncWithOrigin =False19751976# Force a checkpoint in fast-import and wait for it to finish1977defcheckpoint(self):1978 self.gitStream.write("checkpoint\n\n")1979 self.gitStream.write("progress checkpoint\n\n")1980 out = self.gitOutput.readline()1981if self.verbose:1982print"checkpoint finished: "+ out19831984defextractFilesFromCommit(self, commit):1985 self.cloneExclude = [re.sub(r"\.\.\.$","", path)1986for path in self.cloneExclude]1987 files = []1988 fnum =01989while commit.has_key("depotFile%s"% fnum):1990 path = commit["depotFile%s"% fnum]19911992if[p for p in self.cloneExclude1993ifp4PathStartsWith(path, p)]:1994 found =False1995else:1996 found = [p for p in self.depotPaths1997ifp4PathStartsWith(path, p)]1998if not found:1999 fnum = fnum +12000continue20012002file= {}2003file["path"] = path2004file["rev"] = commit["rev%s"% fnum]2005file["action"] = commit["action%s"% fnum]2006file["type"] = commit["type%s"% fnum]2007 files.append(file)2008 fnum = fnum +12009return files20102011defstripRepoPath(self, path, prefixes):2012"""When streaming files, this is called to map a p4 depot path2013 to where it should go in git. The prefixes are either2014 self.depotPaths, or self.branchPrefixes in the case of2015 branch detection."""20162017if self.useClientSpec:2018# branch detection moves files up a level (the branch name)2019# from what client spec interpretation gives2020 path = self.clientSpecDirs.map_in_client(path)2021if self.detectBranches:2022for b in self.knownBranches:2023if path.startswith(b +"/"):2024 path = path[len(b)+1:]20252026elif self.keepRepoPath:2027# Preserve everything in relative path name except leading2028# //depot/; just look at first prefix as they all should2029# be in the same depot.2030 depot = re.sub("^(//[^/]+/).*", r'\1', prefixes[0])2031ifp4PathStartsWith(path, depot):2032 path = path[len(depot):]20332034else:2035for p in prefixes:2036ifp4PathStartsWith(path, p):2037 path = path[len(p):]2038break20392040 path =wildcard_decode(path)2041return path20422043defsplitFilesIntoBranches(self, commit):2044"""Look at each depotFile in the commit to figure out to what2045 branch it belongs."""20462047 branches = {}2048 fnum =02049while commit.has_key("depotFile%s"% fnum):2050 path = commit["depotFile%s"% fnum]2051 found = [p for p in self.depotPaths2052ifp4PathStartsWith(path, p)]2053if not found:2054 fnum = fnum +12055continue20562057file= {}2058file["path"] = path2059file["rev"] = commit["rev%s"% fnum]2060file["action"] = commit["action%s"% fnum]2061file["type"] = commit["type%s"% fnum]2062 fnum = fnum +120632064# start with the full relative path where this file would2065# go in a p4 client2066if self.useClientSpec:2067 relPath = self.clientSpecDirs.map_in_client(path)2068else:2069 relPath = self.stripRepoPath(path, self.depotPaths)20702071for branch in self.knownBranches.keys():2072# add a trailing slash so that a commit into qt/4.2foo2073# doesn't end up in qt/4.2, e.g.2074if relPath.startswith(branch +"/"):2075if branch not in branches:2076 branches[branch] = []2077 branches[branch].append(file)2078break20792080return branches20812082# output one file from the P4 stream2083# - helper for streamP4Files20842085defstreamOneP4File(self,file, contents):2086 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)2087if verbose:2088 sys.stderr.write("%s\n"% relPath)20892090(type_base, type_mods) =split_p4_type(file["type"])20912092 git_mode ="100644"2093if"x"in type_mods:2094 git_mode ="100755"2095if type_base =="symlink":2096 git_mode ="120000"2097# p4 print on a symlink contains "target\n"; remove the newline2098 data =''.join(contents)2099 contents = [data[:-1]]21002101if type_base =="utf16":2102# p4 delivers different text in the python output to -G2103# than it does when using "print -o", or normal p4 client2104# operations. utf16 is converted to ascii or utf8, perhaps.2105# But ascii text saved as -t utf16 is completely mangled.2106# Invoke print -o to get the real contents.2107 text =p4_read_pipe(['print','-q','-o','-',file['depotFile']])2108 contents = [ text ]21092110if type_base =="apple":2111# Apple filetype files will be streamed as a concatenation of2112# its appledouble header and the contents. This is useless2113# on both macs and non-macs. If using "print -q -o xx", it2114# will create "xx" with the data, and "%xx" with the header.2115# This is also not very useful.2116#2117# Ideally, someday, this script can learn how to generate2118# appledouble files directly and import those to git, but2119# non-mac machines can never find a use for apple filetype.2120print"\nIgnoring apple filetype file%s"%file['depotFile']2121return21222123# Perhaps windows wants unicode, utf16 newlines translated too;2124# but this is not doing it.2125if self.isWindows and type_base =="text":2126 mangled = []2127for data in contents:2128 data = data.replace("\r\n","\n")2129 mangled.append(data)2130 contents = mangled21312132# Note that we do not try to de-mangle keywords on utf16 files,2133# even though in theory somebody may want that.2134 pattern =p4_keywords_regexp_for_type(type_base, type_mods)2135if pattern:2136 regexp = re.compile(pattern, re.VERBOSE)2137 text =''.join(contents)2138 text = regexp.sub(r'$\1$', text)2139 contents = [ text ]21402141 self.gitStream.write("M%sinline%s\n"% (git_mode, relPath))21422143# total length...2144 length =02145for d in contents:2146 length = length +len(d)21472148 self.gitStream.write("data%d\n"% length)2149for d in contents:2150 self.gitStream.write(d)2151 self.gitStream.write("\n")21522153defstreamOneP4Deletion(self,file):2154 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)2155if verbose:2156 sys.stderr.write("delete%s\n"% relPath)2157 self.gitStream.write("D%s\n"% relPath)21582159# handle another chunk of streaming data2160defstreamP4FilesCb(self, marshalled):21612162# catch p4 errors and complain2163 err =None2164if"code"in marshalled:2165if marshalled["code"] =="error":2166if"data"in marshalled:2167 err = marshalled["data"].rstrip()2168if err:2169 f =None2170if self.stream_have_file_info:2171if"depotFile"in self.stream_file:2172 f = self.stream_file["depotFile"]2173# force a failure in fast-import, else an empty2174# commit will be made2175 self.gitStream.write("\n")2176 self.gitStream.write("die-now\n")2177 self.gitStream.close()2178# ignore errors, but make sure it exits first2179 self.importProcess.wait()2180if f:2181die("Error from p4 print for%s:%s"% (f, err))2182else:2183die("Error from p4 print:%s"% err)21842185if marshalled.has_key('depotFile')and self.stream_have_file_info:2186# start of a new file - output the old one first2187 self.streamOneP4File(self.stream_file, self.stream_contents)2188 self.stream_file = {}2189 self.stream_contents = []2190 self.stream_have_file_info =False21912192# pick up the new file information... for the2193# 'data' field we need to append to our array2194for k in marshalled.keys():2195if k =='data':2196 self.stream_contents.append(marshalled['data'])2197else:2198 self.stream_file[k] = marshalled[k]21992200 self.stream_have_file_info =True22012202# Stream directly from "p4 files" into "git fast-import"2203defstreamP4Files(self, files):2204 filesForCommit = []2205 filesToRead = []2206 filesToDelete = []22072208for f in files:2209# if using a client spec, only add the files that have2210# a path in the client2211if self.clientSpecDirs:2212if self.clientSpecDirs.map_in_client(f['path']) =="":2213continue22142215 filesForCommit.append(f)2216if f['action']in self.delete_actions:2217 filesToDelete.append(f)2218else:2219 filesToRead.append(f)22202221# deleted files...2222for f in filesToDelete:2223 self.streamOneP4Deletion(f)22242225iflen(filesToRead) >0:2226 self.stream_file = {}2227 self.stream_contents = []2228 self.stream_have_file_info =False22292230# curry self argument2231defstreamP4FilesCbSelf(entry):2232 self.streamP4FilesCb(entry)22332234 fileArgs = ['%s#%s'% (f['path'], f['rev'])for f in filesToRead]22352236p4CmdList(["-x","-","print"],2237 stdin=fileArgs,2238 cb=streamP4FilesCbSelf)22392240# do the last chunk2241if self.stream_file.has_key('depotFile'):2242 self.streamOneP4File(self.stream_file, self.stream_contents)22432244defmake_email(self, userid):2245if userid in self.users:2246return self.users[userid]2247else:2248return"%s<a@b>"% userid22492250# Stream a p4 tag2251defstreamTag(self, gitStream, labelName, labelDetails, commit, epoch):2252if verbose:2253print"writing tag%sfor commit%s"% (labelName, commit)2254 gitStream.write("tag%s\n"% labelName)2255 gitStream.write("from%s\n"% commit)22562257if labelDetails.has_key('Owner'):2258 owner = labelDetails["Owner"]2259else:2260 owner =None22612262# Try to use the owner of the p4 label, or failing that,2263# the current p4 user id.2264if owner:2265 email = self.make_email(owner)2266else:2267 email = self.make_email(self.p4UserId())2268 tagger ="%s %s %s"% (email, epoch, self.tz)22692270 gitStream.write("tagger%s\n"% tagger)22712272print"labelDetails=",labelDetails2273if labelDetails.has_key('Description'):2274 description = labelDetails['Description']2275else:2276 description ='Label from git p4'22772278 gitStream.write("data%d\n"%len(description))2279 gitStream.write(description)2280 gitStream.write("\n")22812282defcommit(self, details, files, branch, parent =""):2283 epoch = details["time"]2284 author = details["user"]22852286if self.verbose:2287print"commit into%s"% branch22882289# start with reading files; if that fails, we should not2290# create a commit.2291 new_files = []2292for f in files:2293if[p for p in self.branchPrefixes ifp4PathStartsWith(f['path'], p)]:2294 new_files.append(f)2295else:2296 sys.stderr.write("Ignoring file outside of prefix:%s\n"% f['path'])22972298 self.gitStream.write("commit%s\n"% branch)2299# gitStream.write("mark :%s\n" % details["change"])2300 self.committedChanges.add(int(details["change"]))2301 committer =""2302if author not in self.users:2303 self.getUserMapFromPerforceServer()2304 committer ="%s %s %s"% (self.make_email(author), epoch, self.tz)23052306 self.gitStream.write("committer%s\n"% committer)23072308 self.gitStream.write("data <<EOT\n")2309 self.gitStream.write(details["desc"])2310 self.gitStream.write("\n[git-p4: depot-paths =\"%s\": change =%s"%2311(','.join(self.branchPrefixes), details["change"]))2312iflen(details['options']) >0:2313 self.gitStream.write(": options =%s"% details['options'])2314 self.gitStream.write("]\nEOT\n\n")23152316iflen(parent) >0:2317if self.verbose:2318print"parent%s"% parent2319 self.gitStream.write("from%s\n"% parent)23202321 self.streamP4Files(new_files)2322 self.gitStream.write("\n")23232324 change =int(details["change"])23252326if self.labels.has_key(change):2327 label = self.labels[change]2328 labelDetails = label[0]2329 labelRevisions = label[1]2330if self.verbose:2331print"Change%sis labelled%s"% (change, labelDetails)23322333 files =p4CmdList(["files"] + ["%s...@%s"% (p, change)2334for p in self.branchPrefixes])23352336iflen(files) ==len(labelRevisions):23372338 cleanedFiles = {}2339for info in files:2340if info["action"]in self.delete_actions:2341continue2342 cleanedFiles[info["depotFile"]] = info["rev"]23432344if cleanedFiles == labelRevisions:2345 self.streamTag(self.gitStream,'tag_%s'% labelDetails['label'], labelDetails, branch, epoch)23462347else:2348if not self.silent:2349print("Tag%sdoes not match with change%s: files do not match."2350% (labelDetails["label"], change))23512352else:2353if not self.silent:2354print("Tag%sdoes not match with change%s: file count is different."2355% (labelDetails["label"], change))23562357# Build a dictionary of changelists and labels, for "detect-labels" option.2358defgetLabels(self):2359 self.labels = {}23602361 l =p4CmdList(["labels"] + ["%s..."% p for p in self.depotPaths])2362iflen(l) >0and not self.silent:2363print"Finding files belonging to labels in%s"% `self.depotPaths`23642365for output in l:2366 label = output["label"]2367 revisions = {}2368 newestChange =02369if self.verbose:2370print"Querying files for label%s"% label2371forfileinp4CmdList(["files"] +2372["%s...@%s"% (p, label)2373for p in self.depotPaths]):2374 revisions[file["depotFile"]] =file["rev"]2375 change =int(file["change"])2376if change > newestChange:2377 newestChange = change23782379 self.labels[newestChange] = [output, revisions]23802381if self.verbose:2382print"Label changes:%s"% self.labels.keys()23832384# Import p4 labels as git tags. A direct mapping does not2385# exist, so assume that if all the files are at the same revision2386# then we can use that, or it's something more complicated we should2387# just ignore.2388defimportP4Labels(self, stream, p4Labels):2389if verbose:2390print"import p4 labels: "+' '.join(p4Labels)23912392 ignoredP4Labels =gitConfigList("git-p4.ignoredP4Labels")2393 validLabelRegexp =gitConfig("git-p4.labelImportRegexp")2394iflen(validLabelRegexp) ==0:2395 validLabelRegexp = defaultLabelRegexp2396 m = re.compile(validLabelRegexp)23972398for name in p4Labels:2399 commitFound =False24002401if not m.match(name):2402if verbose:2403print"label%sdoes not match regexp%s"% (name,validLabelRegexp)2404continue24052406if name in ignoredP4Labels:2407continue24082409 labelDetails =p4CmdList(['label',"-o", name])[0]24102411# get the most recent changelist for each file in this label2412 change =p4Cmd(["changes","-m","1"] + ["%s...@%s"% (p, name)2413for p in self.depotPaths])24142415if change.has_key('change'):2416# find the corresponding git commit; take the oldest commit2417 changelist =int(change['change'])2418 gitCommit =read_pipe(["git","rev-list","--max-count=1",2419"--reverse",":/\[git-p4:.*change =%d\]"% changelist])2420iflen(gitCommit) ==0:2421print"could not find git commit for changelist%d"% changelist2422else:2423 gitCommit = gitCommit.strip()2424 commitFound =True2425# Convert from p4 time format2426try:2427 tmwhen = time.strptime(labelDetails['Update'],"%Y/%m/%d%H:%M:%S")2428exceptValueError:2429print"Could not convert label time%s"% labelDetails['Update']2430 tmwhen =124312432 when =int(time.mktime(tmwhen))2433 self.streamTag(stream, name, labelDetails, gitCommit, when)2434if verbose:2435print"p4 label%smapped to git commit%s"% (name, gitCommit)2436else:2437if verbose:2438print"Label%shas no changelists - possibly deleted?"% name24392440if not commitFound:2441# We can't import this label; don't try again as it will get very2442# expensive repeatedly fetching all the files for labels that will2443# never be imported. If the label is moved in the future, the2444# ignore will need to be removed manually.2445system(["git","config","--add","git-p4.ignoredP4Labels", name])24462447defguessProjectName(self):2448for p in self.depotPaths:2449if p.endswith("/"):2450 p = p[:-1]2451 p = p[p.strip().rfind("/") +1:]2452if not p.endswith("/"):2453 p +="/"2454return p24552456defgetBranchMapping(self):2457 lostAndFoundBranches =set()24582459 user =gitConfig("git-p4.branchUser")2460iflen(user) >0:2461 command ="branches -u%s"% user2462else:2463 command ="branches"24642465for info inp4CmdList(command):2466 details =p4Cmd(["branch","-o", info["branch"]])2467 viewIdx =02468while details.has_key("View%s"% viewIdx):2469 paths = details["View%s"% viewIdx].split(" ")2470 viewIdx = viewIdx +12471# require standard //depot/foo/... //depot/bar/... mapping2472iflen(paths) !=2or not paths[0].endswith("/...")or not paths[1].endswith("/..."):2473continue2474 source = paths[0]2475 destination = paths[1]2476## HACK2477ifp4PathStartsWith(source, self.depotPaths[0])andp4PathStartsWith(destination, self.depotPaths[0]):2478 source = source[len(self.depotPaths[0]):-4]2479 destination = destination[len(self.depotPaths[0]):-4]24802481if destination in self.knownBranches:2482if not self.silent:2483print"p4 branch%sdefines a mapping from%sto%s"% (info["branch"], source, destination)2484print"but there exists another mapping from%sto%salready!"% (self.knownBranches[destination], destination)2485continue24862487 self.knownBranches[destination] = source24882489 lostAndFoundBranches.discard(destination)24902491if source not in self.knownBranches:2492 lostAndFoundBranches.add(source)24932494# Perforce does not strictly require branches to be defined, so we also2495# check git config for a branch list.2496#2497# Example of branch definition in git config file:2498# [git-p4]2499# branchList=main:branchA2500# branchList=main:branchB2501# branchList=branchA:branchC2502 configBranches =gitConfigList("git-p4.branchList")2503for branch in configBranches:2504if branch:2505(source, destination) = branch.split(":")2506 self.knownBranches[destination] = source25072508 lostAndFoundBranches.discard(destination)25092510if source not in self.knownBranches:2511 lostAndFoundBranches.add(source)251225132514for branch in lostAndFoundBranches:2515 self.knownBranches[branch] = branch25162517defgetBranchMappingFromGitBranches(self):2518 branches =p4BranchesInGit(self.importIntoRemotes)2519for branch in branches.keys():2520if branch =="master":2521 branch ="main"2522else:2523 branch = branch[len(self.projectName):]2524 self.knownBranches[branch] = branch25252526defupdateOptionDict(self, d):2527 option_keys = {}2528if self.keepRepoPath:2529 option_keys['keepRepoPath'] =125302531 d["options"] =' '.join(sorted(option_keys.keys()))25322533defreadOptions(self, d):2534 self.keepRepoPath = (d.has_key('options')2535and('keepRepoPath'in d['options']))25362537defgitRefForBranch(self, branch):2538if branch =="main":2539return self.refPrefix +"master"25402541iflen(branch) <=0:2542return branch25432544return self.refPrefix + self.projectName + branch25452546defgitCommitByP4Change(self, ref, change):2547if self.verbose:2548print"looking in ref "+ ref +" for change%susing bisect..."% change25492550 earliestCommit =""2551 latestCommit =parseRevision(ref)25522553while True:2554if self.verbose:2555print"trying: earliest%slatest%s"% (earliestCommit, latestCommit)2556 next =read_pipe("git rev-list --bisect%s %s"% (latestCommit, earliestCommit)).strip()2557iflen(next) ==0:2558if self.verbose:2559print"argh"2560return""2561 log =extractLogMessageFromGitCommit(next)2562 settings =extractSettingsGitLog(log)2563 currentChange =int(settings['change'])2564if self.verbose:2565print"current change%s"% currentChange25662567if currentChange == change:2568if self.verbose:2569print"found%s"% next2570return next25712572if currentChange < change:2573 earliestCommit ="^%s"% next2574else:2575 latestCommit ="%s"% next25762577return""25782579defimportNewBranch(self, branch, maxChange):2580# make fast-import flush all changes to disk and update the refs using the checkpoint2581# command so that we can try to find the branch parent in the git history2582 self.gitStream.write("checkpoint\n\n");2583 self.gitStream.flush();2584 branchPrefix = self.depotPaths[0] + branch +"/"2585range="@1,%s"% maxChange2586#print "prefix" + branchPrefix2587 changes =p4ChangesForPaths([branchPrefix],range)2588iflen(changes) <=0:2589return False2590 firstChange = changes[0]2591#print "first change in branch: %s" % firstChange2592 sourceBranch = self.knownBranches[branch]2593 sourceDepotPath = self.depotPaths[0] + sourceBranch2594 sourceRef = self.gitRefForBranch(sourceBranch)2595#print "source " + sourceBranch25962597 branchParentChange =int(p4Cmd(["changes","-m","1","%s...@1,%s"% (sourceDepotPath, firstChange)])["change"])2598#print "branch parent: %s" % branchParentChange2599 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)2600iflen(gitParent) >0:2601 self.initialParents[self.gitRefForBranch(branch)] = gitParent2602#print "parent git commit: %s" % gitParent26032604 self.importChanges(changes)2605return True26062607defsearchParent(self, parent, branch, target):2608 parentFound =False2609for blob inread_pipe_lines(["git","rev-list","--reverse","--no-merges", parent]):2610 blob = blob.strip()2611iflen(read_pipe(["git","diff-tree", blob, target])) ==0:2612 parentFound =True2613if self.verbose:2614print"Found parent of%sin commit%s"% (branch, blob)2615break2616if parentFound:2617return blob2618else:2619return None26202621defimportChanges(self, changes):2622 cnt =12623for change in changes:2624 description =p4_describe(change)2625 self.updateOptionDict(description)26262627if not self.silent:2628 sys.stdout.write("\rImporting revision%s(%s%%)"% (change, cnt *100/len(changes)))2629 sys.stdout.flush()2630 cnt = cnt +126312632try:2633if self.detectBranches:2634 branches = self.splitFilesIntoBranches(description)2635for branch in branches.keys():2636## HACK --hwn2637 branchPrefix = self.depotPaths[0] + branch +"/"2638 self.branchPrefixes = [ branchPrefix ]26392640 parent =""26412642 filesForCommit = branches[branch]26432644if self.verbose:2645print"branch is%s"% branch26462647 self.updatedBranches.add(branch)26482649if branch not in self.createdBranches:2650 self.createdBranches.add(branch)2651 parent = self.knownBranches[branch]2652if parent == branch:2653 parent =""2654else:2655 fullBranch = self.projectName + branch2656if fullBranch not in self.p4BranchesInGit:2657if not self.silent:2658print("\nImporting new branch%s"% fullBranch);2659if self.importNewBranch(branch, change -1):2660 parent =""2661 self.p4BranchesInGit.append(fullBranch)2662if not self.silent:2663print("\nResuming with change%s"% change);26642665if self.verbose:2666print"parent determined through known branches:%s"% parent26672668 branch = self.gitRefForBranch(branch)2669 parent = self.gitRefForBranch(parent)26702671if self.verbose:2672print"looking for initial parent for%s; current parent is%s"% (branch, parent)26732674iflen(parent) ==0and branch in self.initialParents:2675 parent = self.initialParents[branch]2676del self.initialParents[branch]26772678 blob =None2679iflen(parent) >0:2680 tempBranch = os.path.join(self.tempBranchLocation,"%d"% (change))2681if self.verbose:2682print"Creating temporary branch: "+ tempBranch2683 self.commit(description, filesForCommit, tempBranch)2684 self.tempBranches.append(tempBranch)2685 self.checkpoint()2686 blob = self.searchParent(parent, branch, tempBranch)2687if blob:2688 self.commit(description, filesForCommit, branch, blob)2689else:2690if self.verbose:2691print"Parent of%snot found. Committing into head of%s"% (branch, parent)2692 self.commit(description, filesForCommit, branch, parent)2693else:2694 files = self.extractFilesFromCommit(description)2695 self.commit(description, files, self.branch,2696 self.initialParent)2697# only needed once, to connect to the previous commit2698 self.initialParent =""2699exceptIOError:2700print self.gitError.read()2701 sys.exit(1)27022703defimportHeadRevision(self, revision):2704print"Doing initial import of%sfrom revision%sinto%s"% (' '.join(self.depotPaths), revision, self.branch)27052706 details = {}2707 details["user"] ="git perforce import user"2708 details["desc"] = ("Initial import of%sfrom the state at revision%s\n"2709% (' '.join(self.depotPaths), revision))2710 details["change"] = revision2711 newestRevision =027122713 fileCnt =02714 fileArgs = ["%s...%s"% (p,revision)for p in self.depotPaths]27152716for info inp4CmdList(["files"] + fileArgs):27172718if'code'in info and info['code'] =='error':2719 sys.stderr.write("p4 returned an error:%s\n"2720% info['data'])2721if info['data'].find("must refer to client") >=0:2722 sys.stderr.write("This particular p4 error is misleading.\n")2723 sys.stderr.write("Perhaps the depot path was misspelled.\n");2724 sys.stderr.write("Depot path:%s\n"%" ".join(self.depotPaths))2725 sys.exit(1)2726if'p4ExitCode'in info:2727 sys.stderr.write("p4 exitcode:%s\n"% info['p4ExitCode'])2728 sys.exit(1)272927302731 change =int(info["change"])2732if change > newestRevision:2733 newestRevision = change27342735if info["action"]in self.delete_actions:2736# don't increase the file cnt, otherwise details["depotFile123"] will have gaps!2737#fileCnt = fileCnt + 12738continue27392740for prop in["depotFile","rev","action","type"]:2741 details["%s%s"% (prop, fileCnt)] = info[prop]27422743 fileCnt = fileCnt +127442745 details["change"] = newestRevision27462747# Use time from top-most change so that all git p4 clones of2748# the same p4 repo have the same commit SHA1s.2749 res =p4_describe(newestRevision)2750 details["time"] = res["time"]27512752 self.updateOptionDict(details)2753try:2754 self.commit(details, self.extractFilesFromCommit(details), self.branch)2755exceptIOError:2756print"IO error with git fast-import. Is your git version recent enough?"2757print self.gitError.read()275827592760defrun(self, args):2761 self.depotPaths = []2762 self.changeRange =""2763 self.previousDepotPaths = []2764 self.hasOrigin =False27652766# map from branch depot path to parent branch2767 self.knownBranches = {}2768 self.initialParents = {}27692770if self.importIntoRemotes:2771 self.refPrefix ="refs/remotes/p4/"2772else:2773 self.refPrefix ="refs/heads/p4/"27742775if self.syncWithOrigin:2776 self.hasOrigin =originP4BranchesExist()2777if self.hasOrigin:2778if not self.silent:2779print'Syncing with origin first, using "git fetch origin"'2780system("git fetch origin")27812782 branch_arg_given =bool(self.branch)2783iflen(self.branch) ==0:2784 self.branch = self.refPrefix +"master"2785ifgitBranchExists("refs/heads/p4")and self.importIntoRemotes:2786system("git update-ref%srefs/heads/p4"% self.branch)2787system("git branch -D p4")27882789# accept either the command-line option, or the configuration variable2790if self.useClientSpec:2791# will use this after clone to set the variable2792 self.useClientSpec_from_options =True2793else:2794ifgitConfig("git-p4.useclientspec","--bool") =="true":2795 self.useClientSpec =True2796if self.useClientSpec:2797 self.clientSpecDirs =getClientSpec()27982799# TODO: should always look at previous commits,2800# merge with previous imports, if possible.2801if args == []:2802if self.hasOrigin:2803createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)28042805# branches holds mapping from branch name to sha12806 branches =p4BranchesInGit(self.importIntoRemotes)28072808# restrict to just this one, disabling detect-branches2809if branch_arg_given:2810 short = self.branch.split("/")[-1]2811if short in branches:2812 self.p4BranchesInGit = [ short ]2813else:2814 self.p4BranchesInGit = branches.keys()28152816iflen(self.p4BranchesInGit) >1:2817if not self.silent:2818print"Importing from/into multiple branches"2819 self.detectBranches =True2820for branch in branches.keys():2821 self.initialParents[self.refPrefix + branch] = \2822 branches[branch]28232824if self.verbose:2825print"branches:%s"% self.p4BranchesInGit28262827 p4Change =02828for branch in self.p4BranchesInGit:2829 logMsg =extractLogMessageFromGitCommit(self.refPrefix + branch)28302831 settings =extractSettingsGitLog(logMsg)28322833 self.readOptions(settings)2834if(settings.has_key('depot-paths')2835and settings.has_key('change')):2836 change =int(settings['change']) +12837 p4Change =max(p4Change, change)28382839 depotPaths =sorted(settings['depot-paths'])2840if self.previousDepotPaths == []:2841 self.previousDepotPaths = depotPaths2842else:2843 paths = []2844for(prev, cur)inzip(self.previousDepotPaths, depotPaths):2845 prev_list = prev.split("/")2846 cur_list = cur.split("/")2847for i inrange(0,min(len(cur_list),len(prev_list))):2848if cur_list[i] <> prev_list[i]:2849 i = i -12850break28512852 paths.append("/".join(cur_list[:i +1]))28532854 self.previousDepotPaths = paths28552856if p4Change >0:2857 self.depotPaths =sorted(self.previousDepotPaths)2858 self.changeRange ="@%s,#head"% p4Change2859if not self.silent and not self.detectBranches:2860print"Performing incremental import into%sgit branch"% self.branch28612862# accept multiple ref name abbreviations:2863# refs/foo/bar/branch -> use it exactly2864# p4/branch -> prepend refs/remotes/ or refs/heads/2865# branch -> prepend refs/remotes/p4/ or refs/heads/p4/2866if not self.branch.startswith("refs/"):2867if self.importIntoRemotes:2868 prepend ="refs/remotes/"2869else:2870 prepend ="refs/heads/"2871if not self.branch.startswith("p4/"):2872 prepend +="p4/"2873 self.branch = prepend + self.branch28742875iflen(args) ==0and self.depotPaths:2876if not self.silent:2877print"Depot paths:%s"%' '.join(self.depotPaths)2878else:2879if self.depotPaths and self.depotPaths != args:2880print("previous import used depot path%sand now%swas specified. "2881"This doesn't work!"% (' '.join(self.depotPaths),2882' '.join(args)))2883 sys.exit(1)28842885 self.depotPaths =sorted(args)28862887 revision =""2888 self.users = {}28892890# Make sure no revision specifiers are used when --changesfile2891# is specified.2892 bad_changesfile =False2893iflen(self.changesFile) >0:2894for p in self.depotPaths:2895if p.find("@") >=0or p.find("#") >=0:2896 bad_changesfile =True2897break2898if bad_changesfile:2899die("Option --changesfile is incompatible with revision specifiers")29002901 newPaths = []2902for p in self.depotPaths:2903if p.find("@") != -1:2904 atIdx = p.index("@")2905 self.changeRange = p[atIdx:]2906if self.changeRange =="@all":2907 self.changeRange =""2908elif','not in self.changeRange:2909 revision = self.changeRange2910 self.changeRange =""2911 p = p[:atIdx]2912elif p.find("#") != -1:2913 hashIdx = p.index("#")2914 revision = p[hashIdx:]2915 p = p[:hashIdx]2916elif self.previousDepotPaths == []:2917# pay attention to changesfile, if given, else import2918# the entire p4 tree at the head revision2919iflen(self.changesFile) ==0:2920 revision ="#head"29212922 p = re.sub("\.\.\.$","", p)2923if not p.endswith("/"):2924 p +="/"29252926 newPaths.append(p)29272928 self.depotPaths = newPaths29292930# --detect-branches may change this for each branch2931 self.branchPrefixes = self.depotPaths29322933 self.loadUserMapFromCache()2934 self.labels = {}2935if self.detectLabels:2936 self.getLabels();29372938if self.detectBranches:2939## FIXME - what's a P4 projectName ?2940 self.projectName = self.guessProjectName()29412942if self.hasOrigin:2943 self.getBranchMappingFromGitBranches()2944else:2945 self.getBranchMapping()2946if self.verbose:2947print"p4-git branches:%s"% self.p4BranchesInGit2948print"initial parents:%s"% self.initialParents2949for b in self.p4BranchesInGit:2950if b !="master":29512952## FIXME2953 b = b[len(self.projectName):]2954 self.createdBranches.add(b)29552956 self.tz ="%+03d%02d"% (- time.timezone /3600, ((- time.timezone %3600) /60))29572958 self.importProcess = subprocess.Popen(["git","fast-import"],2959 stdin=subprocess.PIPE,2960 stdout=subprocess.PIPE,2961 stderr=subprocess.PIPE);2962 self.gitOutput = self.importProcess.stdout2963 self.gitStream = self.importProcess.stdin2964 self.gitError = self.importProcess.stderr29652966if revision:2967 self.importHeadRevision(revision)2968else:2969 changes = []29702971iflen(self.changesFile) >0:2972 output =open(self.changesFile).readlines()2973 changeSet =set()2974for line in output:2975 changeSet.add(int(line))29762977for change in changeSet:2978 changes.append(change)29792980 changes.sort()2981else:2982# catch "git p4 sync" with no new branches, in a repo that2983# does not have any existing p4 branches2984iflen(args) ==0:2985if not self.p4BranchesInGit:2986die("No remote p4 branches. Perhaps you never did\"git p4 clone\"in here.")29872988# The default branch is master, unless --branch is used to2989# specify something else. Make sure it exists, or complain2990# nicely about how to use --branch.2991if not self.detectBranches:2992if notbranch_exists(self.branch):2993if branch_arg_given:2994die("Error: branch%sdoes not exist."% self.branch)2995else:2996die("Error: no branch%s; perhaps specify one with --branch."%2997 self.branch)29982999if self.verbose:3000print"Getting p4 changes for%s...%s"% (', '.join(self.depotPaths),3001 self.changeRange)3002 changes =p4ChangesForPaths(self.depotPaths, self.changeRange)30033004iflen(self.maxChanges) >0:3005 changes = changes[:min(int(self.maxChanges),len(changes))]30063007iflen(changes) ==0:3008if not self.silent:3009print"No changes to import!"3010else:3011if not self.silent and not self.detectBranches:3012print"Import destination:%s"% self.branch30133014 self.updatedBranches =set()30153016if not self.detectBranches:3017if args:3018# start a new branch3019 self.initialParent =""3020else:3021# build on a previous revision3022 self.initialParent =parseRevision(self.branch)30233024 self.importChanges(changes)30253026if not self.silent:3027print""3028iflen(self.updatedBranches) >0:3029 sys.stdout.write("Updated branches: ")3030for b in self.updatedBranches:3031 sys.stdout.write("%s"% b)3032 sys.stdout.write("\n")30333034ifgitConfig("git-p4.importLabels","--bool") =="true":3035 self.importLabels =True30363037if self.importLabels:3038 p4Labels =getP4Labels(self.depotPaths)3039 gitTags =getGitTags()30403041 missingP4Labels = p4Labels - gitTags3042 self.importP4Labels(self.gitStream, missingP4Labels)30433044 self.gitStream.close()3045if self.importProcess.wait() !=0:3046die("fast-import failed:%s"% self.gitError.read())3047 self.gitOutput.close()3048 self.gitError.close()30493050# Cleanup temporary branches created during import3051if self.tempBranches != []:3052for branch in self.tempBranches:3053read_pipe("git update-ref -d%s"% branch)3054 os.rmdir(os.path.join(os.environ.get("GIT_DIR",".git"), self.tempBranchLocation))30553056# Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow3057# a convenient shortcut refname "p4".3058if self.importIntoRemotes:3059 head_ref = self.refPrefix +"HEAD"3060if notgitBranchExists(head_ref)andgitBranchExists(self.branch):3061system(["git","symbolic-ref", head_ref, self.branch])30623063return True30643065classP4Rebase(Command):3066def__init__(self):3067 Command.__init__(self)3068 self.options = [3069 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),3070]3071 self.importLabels =False3072 self.description = ("Fetches the latest revision from perforce and "3073+"rebases the current work (branch) against it")30743075defrun(self, args):3076 sync =P4Sync()3077 sync.importLabels = self.importLabels3078 sync.run([])30793080return self.rebase()30813082defrebase(self):3083if os.system("git update-index --refresh") !=0:3084die("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.");3085iflen(read_pipe("git diff-index HEAD --")) >0:3086die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash.");30873088[upstream, settings] =findUpstreamBranchPoint()3089iflen(upstream) ==0:3090die("Cannot find upstream branchpoint for rebase")30913092# the branchpoint may be p4/foo~3, so strip off the parent3093 upstream = re.sub("~[0-9]+$","", upstream)30943095print"Rebasing the current branch onto%s"% upstream3096 oldHead =read_pipe("git rev-parse HEAD").strip()3097system("git rebase%s"% upstream)3098system("git diff-tree --stat --summary -M%sHEAD"% oldHead)3099return True31003101classP4Clone(P4Sync):3102def__init__(self):3103 P4Sync.__init__(self)3104 self.description ="Creates a new git repository and imports from Perforce into it"3105 self.usage ="usage: %prog [options] //depot/path[@revRange]"3106 self.options += [3107 optparse.make_option("--destination", dest="cloneDestination",3108 action='store', default=None,3109help="where to leave result of the clone"),3110 optparse.make_option("-/", dest="cloneExclude",3111 action="append",type="string",3112help="exclude depot path"),3113 optparse.make_option("--bare", dest="cloneBare",3114 action="store_true", default=False),3115]3116 self.cloneDestination =None3117 self.needsGit =False3118 self.cloneBare =False31193120# This is required for the "append" cloneExclude action3121defensure_value(self, attr, value):3122if nothasattr(self, attr)orgetattr(self, attr)is None:3123setattr(self, attr, value)3124returngetattr(self, attr)31253126defdefaultDestination(self, args):3127## TODO: use common prefix of args?3128 depotPath = args[0]3129 depotDir = re.sub("(@[^@]*)$","", depotPath)3130 depotDir = re.sub("(#[^#]*)$","", depotDir)3131 depotDir = re.sub(r"\.\.\.$","", depotDir)3132 depotDir = re.sub(r"/$","", depotDir)3133return os.path.split(depotDir)[1]31343135defrun(self, args):3136iflen(args) <1:3137return False31383139if self.keepRepoPath and not self.cloneDestination:3140 sys.stderr.write("Must specify destination for --keep-path\n")3141 sys.exit(1)31423143 depotPaths = args31443145if not self.cloneDestination andlen(depotPaths) >1:3146 self.cloneDestination = depotPaths[-1]3147 depotPaths = depotPaths[:-1]31483149 self.cloneExclude = ["/"+p for p in self.cloneExclude]3150for p in depotPaths:3151if not p.startswith("//"):3152return False31533154if not self.cloneDestination:3155 self.cloneDestination = self.defaultDestination(args)31563157print"Importing from%sinto%s"% (', '.join(depotPaths), self.cloneDestination)31583159if not os.path.exists(self.cloneDestination):3160 os.makedirs(self.cloneDestination)3161chdir(self.cloneDestination)31623163 init_cmd = ["git","init"]3164if self.cloneBare:3165 init_cmd.append("--bare")3166 subprocess.check_call(init_cmd)31673168if not P4Sync.run(self, depotPaths):3169return False31703171# create a master branch and check out a work tree3172ifgitBranchExists(self.branch):3173system(["git","branch","master", self.branch ])3174if not self.cloneBare:3175system(["git","checkout","-f"])3176else:3177print'Not checking out any branch, use ' \3178'"git checkout -q -b master <branch>"'31793180# auto-set this variable if invoked with --use-client-spec3181if self.useClientSpec_from_options:3182system("git config --bool git-p4.useclientspec true")31833184return True31853186classP4Branches(Command):3187def__init__(self):3188 Command.__init__(self)3189 self.options = [ ]3190 self.description = ("Shows the git branches that hold imports and their "3191+"corresponding perforce depot paths")3192 self.verbose =False31933194defrun(self, args):3195iforiginP4BranchesExist():3196createOrUpdateBranchesFromOrigin()31973198 cmdline ="git rev-parse --symbolic "3199 cmdline +=" --remotes"32003201for line inread_pipe_lines(cmdline):3202 line = line.strip()32033204if not line.startswith('p4/')or line =="p4/HEAD":3205continue3206 branch = line32073208 log =extractLogMessageFromGitCommit("refs/remotes/%s"% branch)3209 settings =extractSettingsGitLog(log)32103211print"%s<=%s(%s)"% (branch,",".join(settings["depot-paths"]), settings["change"])3212return True32133214classHelpFormatter(optparse.IndentedHelpFormatter):3215def__init__(self):3216 optparse.IndentedHelpFormatter.__init__(self)32173218defformat_description(self, description):3219if description:3220return description +"\n"3221else:3222return""32233224defprintUsage(commands):3225print"usage:%s<command> [options]"% sys.argv[0]3226print""3227print"valid commands:%s"%", ".join(commands)3228print""3229print"Try%s<command> --help for command specific help."% sys.argv[0]3230print""32313232commands = {3233"debug": P4Debug,3234"submit": P4Submit,3235"commit": P4Submit,3236"sync": P4Sync,3237"rebase": P4Rebase,3238"clone": P4Clone,3239"rollback": P4RollBack,3240"branches": P4Branches3241}324232433244defmain():3245iflen(sys.argv[1:]) ==0:3246printUsage(commands.keys())3247 sys.exit(2)32483249 cmdName = sys.argv[1]3250try:3251 klass = commands[cmdName]3252 cmd =klass()3253exceptKeyError:3254print"unknown command%s"% cmdName3255print""3256printUsage(commands.keys())3257 sys.exit(2)32583259 options = cmd.options3260 cmd.gitdir = os.environ.get("GIT_DIR",None)32613262 args = sys.argv[2:]32633264 options.append(optparse.make_option("--verbose","-v", dest="verbose", action="store_true"))3265if cmd.needsGit:3266 options.append(optparse.make_option("--git-dir", dest="gitdir"))32673268 parser = optparse.OptionParser(cmd.usage.replace("%prog","%prog "+ cmdName),3269 options,3270 description = cmd.description,3271 formatter =HelpFormatter())32723273(cmd, args) = parser.parse_args(sys.argv[2:], cmd);3274global verbose3275 verbose = cmd.verbose3276if cmd.needsGit:3277if cmd.gitdir ==None:3278 cmd.gitdir = os.path.abspath(".git")3279if notisValidGitDir(cmd.gitdir):3280 cmd.gitdir =read_pipe("git rev-parse --git-dir").strip()3281if os.path.exists(cmd.gitdir):3282 cdup =read_pipe("git rev-parse --show-cdup").strip()3283iflen(cdup) >0:3284chdir(cdup);32853286if notisValidGitDir(cmd.gitdir):3287ifisValidGitDir(cmd.gitdir +"/.git"):3288 cmd.gitdir +="/.git"3289else:3290die("fatal: cannot locate git repository at%s"% cmd.gitdir)32913292 os.environ["GIT_DIR"] = cmd.gitdir32933294if not cmd.run(args):3295 parser.print_help()3296 sys.exit(2)329732983299if __name__ =='__main__':3300main()