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# 10import sys 11if sys.hexversion <0x02040000: 12# The limiter is the subprocess module 13 sys.stderr.write("git-p4: requires Python 2.4 or later.\n") 14 sys.exit(1) 15import os 16import optparse 17import marshal 18import subprocess 19import tempfile 20import time 21import platform 22import re 23import shutil 24 25verbose =False 26 27# Only labels/tags matching this will be imported/exported 28defaultLabelRegexp = r'[a-zA-Z0-9_\-.]+$' 29 30defp4_build_cmd(cmd): 31"""Build a suitable p4 command line. 32 33 This consolidates building and returning a p4 command line into one 34 location. It means that hooking into the environment, or other configuration 35 can be done more easily. 36 """ 37 real_cmd = ["p4"] 38 39 user =gitConfig("git-p4.user") 40iflen(user) >0: 41 real_cmd += ["-u",user] 42 43 password =gitConfig("git-p4.password") 44iflen(password) >0: 45 real_cmd += ["-P", password] 46 47 port =gitConfig("git-p4.port") 48iflen(port) >0: 49 real_cmd += ["-p", port] 50 51 host =gitConfig("git-p4.host") 52iflen(host) >0: 53 real_cmd += ["-H", host] 54 55 client =gitConfig("git-p4.client") 56iflen(client) >0: 57 real_cmd += ["-c", client] 58 59 60ifisinstance(cmd,basestring): 61 real_cmd =' '.join(real_cmd) +' '+ cmd 62else: 63 real_cmd += cmd 64return real_cmd 65 66defchdir(dir): 67# P4 uses the PWD environment variable rather than getcwd(). Since we're 68# not using the shell, we have to set it ourselves. This path could 69# be relative, so go there first, then figure out where we ended up. 70 os.chdir(dir) 71 os.environ['PWD'] = os.getcwd() 72 73defdie(msg): 74if verbose: 75raiseException(msg) 76else: 77 sys.stderr.write(msg +"\n") 78 sys.exit(1) 79 80defwrite_pipe(c, stdin): 81if verbose: 82 sys.stderr.write('Writing pipe:%s\n'%str(c)) 83 84 expand =isinstance(c,basestring) 85 p = subprocess.Popen(c, stdin=subprocess.PIPE, shell=expand) 86 pipe = p.stdin 87 val = pipe.write(stdin) 88 pipe.close() 89if p.wait(): 90die('Command failed:%s'%str(c)) 91 92return val 93 94defp4_write_pipe(c, stdin): 95 real_cmd =p4_build_cmd(c) 96returnwrite_pipe(real_cmd, stdin) 97 98defread_pipe(c, ignore_error=False): 99if verbose: 100 sys.stderr.write('Reading pipe:%s\n'%str(c)) 101 102 expand =isinstance(c,basestring) 103 p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand) 104 pipe = p.stdout 105 val = pipe.read() 106if p.wait()and not ignore_error: 107die('Command failed:%s'%str(c)) 108 109return val 110 111defp4_read_pipe(c, ignore_error=False): 112 real_cmd =p4_build_cmd(c) 113returnread_pipe(real_cmd, ignore_error) 114 115defread_pipe_lines(c): 116if verbose: 117 sys.stderr.write('Reading pipe:%s\n'%str(c)) 118 119 expand =isinstance(c, basestring) 120 p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand) 121 pipe = p.stdout 122 val = pipe.readlines() 123if pipe.close()or p.wait(): 124die('Command failed:%s'%str(c)) 125 126return val 127 128defp4_read_pipe_lines(c): 129"""Specifically invoke p4 on the command supplied. """ 130 real_cmd =p4_build_cmd(c) 131returnread_pipe_lines(real_cmd) 132 133defp4_has_command(cmd): 134"""Ask p4 for help on this command. If it returns an error, the 135 command does not exist in this version of p4.""" 136 real_cmd =p4_build_cmd(["help", cmd]) 137 p = subprocess.Popen(real_cmd, stdout=subprocess.PIPE, 138 stderr=subprocess.PIPE) 139 p.communicate() 140return p.returncode ==0 141 142defp4_has_move_command(): 143"""See if the move command exists, that it supports -k, and that 144 it has not been administratively disabled. The arguments 145 must be correct, but the filenames do not have to exist. Use 146 ones with wildcards so even if they exist, it will fail.""" 147 148if notp4_has_command("move"): 149return False 150 cmd =p4_build_cmd(["move","-k","@from","@to"]) 151 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 152(out, err) = p.communicate() 153# return code will be 1 in either case 154if err.find("Invalid option") >=0: 155return False 156if err.find("disabled") >=0: 157return False 158# assume it failed because @... was invalid changelist 159return True 160 161defsystem(cmd): 162 expand =isinstance(cmd,basestring) 163if verbose: 164 sys.stderr.write("executing%s\n"%str(cmd)) 165 subprocess.check_call(cmd, shell=expand) 166 167defp4_system(cmd): 168"""Specifically invoke p4 as the system command. """ 169 real_cmd =p4_build_cmd(cmd) 170 expand =isinstance(real_cmd, basestring) 171 subprocess.check_call(real_cmd, shell=expand) 172 173defp4_integrate(src, dest): 174p4_system(["integrate","-Dt",wildcard_encode(src),wildcard_encode(dest)]) 175 176defp4_sync(f, *options): 177p4_system(["sync"] +list(options) + [wildcard_encode(f)]) 178 179defp4_add(f): 180# forcibly add file names with wildcards 181ifwildcard_present(f): 182p4_system(["add","-f", f]) 183else: 184p4_system(["add", f]) 185 186defp4_delete(f): 187p4_system(["delete",wildcard_encode(f)]) 188 189defp4_edit(f): 190p4_system(["edit",wildcard_encode(f)]) 191 192defp4_revert(f): 193p4_system(["revert",wildcard_encode(f)]) 194 195defp4_reopen(type, f): 196p4_system(["reopen","-t",type,wildcard_encode(f)]) 197 198defp4_move(src, dest): 199p4_system(["move","-k",wildcard_encode(src),wildcard_encode(dest)]) 200 201defp4_describe(change): 202"""Make sure it returns a valid result by checking for 203 the presence of field "time". Return a dict of the 204 results.""" 205 206 ds =p4CmdList(["describe","-s",str(change)]) 207iflen(ds) !=1: 208die("p4 describe -s%ddid not return 1 result:%s"% (change,str(ds))) 209 210 d = ds[0] 211 212if"p4ExitCode"in d: 213die("p4 describe -s%dexited with%d:%s"% (change, d["p4ExitCode"], 214str(d))) 215if"code"in d: 216if d["code"] =="error": 217die("p4 describe -s%dreturned error code:%s"% (change,str(d))) 218 219if"time"not in d: 220die("p4 describe -s%dreturned no\"time\":%s"% (change,str(d))) 221 222return d 223 224# 225# Canonicalize the p4 type and return a tuple of the 226# base type, plus any modifiers. See "p4 help filetypes" 227# for a list and explanation. 228# 229defsplit_p4_type(p4type): 230 231 p4_filetypes_historical = { 232"ctempobj":"binary+Sw", 233"ctext":"text+C", 234"cxtext":"text+Cx", 235"ktext":"text+k", 236"kxtext":"text+kx", 237"ltext":"text+F", 238"tempobj":"binary+FSw", 239"ubinary":"binary+F", 240"uresource":"resource+F", 241"uxbinary":"binary+Fx", 242"xbinary":"binary+x", 243"xltext":"text+Fx", 244"xtempobj":"binary+Swx", 245"xtext":"text+x", 246"xunicode":"unicode+x", 247"xutf16":"utf16+x", 248} 249if p4type in p4_filetypes_historical: 250 p4type = p4_filetypes_historical[p4type] 251 mods ="" 252 s = p4type.split("+") 253 base = s[0] 254 mods ="" 255iflen(s) >1: 256 mods = s[1] 257return(base, mods) 258 259# 260# return the raw p4 type of a file (text, text+ko, etc) 261# 262defp4_type(file): 263 results =p4CmdList(["fstat","-T","headType",file]) 264return results[0]['headType'] 265 266# 267# Given a type base and modifier, return a regexp matching 268# the keywords that can be expanded in the file 269# 270defp4_keywords_regexp_for_type(base, type_mods): 271if base in("text","unicode","binary"): 272 kwords =None 273if"ko"in type_mods: 274 kwords ='Id|Header' 275elif"k"in type_mods: 276 kwords ='Id|Header|Author|Date|DateTime|Change|File|Revision' 277else: 278return None 279 pattern = r""" 280 \$ # Starts with a dollar, followed by... 281 (%s) # one of the keywords, followed by... 282 (:[^$\n]+)? # possibly an old expansion, followed by... 283 \$ # another dollar 284 """% kwords 285return pattern 286else: 287return None 288 289# 290# Given a file, return a regexp matching the possible 291# RCS keywords that will be expanded, or None for files 292# with kw expansion turned off. 293# 294defp4_keywords_regexp_for_file(file): 295if not os.path.exists(file): 296return None 297else: 298(type_base, type_mods) =split_p4_type(p4_type(file)) 299returnp4_keywords_regexp_for_type(type_base, type_mods) 300 301defsetP4ExecBit(file, mode): 302# Reopens an already open file and changes the execute bit to match 303# the execute bit setting in the passed in mode. 304 305 p4Type ="+x" 306 307if notisModeExec(mode): 308 p4Type =getP4OpenedType(file) 309 p4Type = re.sub('^([cku]?)x(.*)','\\1\\2', p4Type) 310 p4Type = re.sub('(.*?\+.*?)x(.*?)','\\1\\2', p4Type) 311if p4Type[-1] =="+": 312 p4Type = p4Type[0:-1] 313 314p4_reopen(p4Type,file) 315 316defgetP4OpenedType(file): 317# Returns the perforce file type for the given file. 318 319 result =p4_read_pipe(["opened",wildcard_encode(file)]) 320 match = re.match(".*\((.+)\)\r?$", result) 321if match: 322return match.group(1) 323else: 324die("Could not determine file type for%s(result: '%s')"% (file, result)) 325 326# Return the set of all p4 labels 327defgetP4Labels(depotPaths): 328 labels =set() 329ifisinstance(depotPaths,basestring): 330 depotPaths = [depotPaths] 331 332for l inp4CmdList(["labels"] + ["%s..."% p for p in depotPaths]): 333 label = l['label'] 334 labels.add(label) 335 336return labels 337 338# Return the set of all git tags 339defgetGitTags(): 340 gitTags =set() 341for line inread_pipe_lines(["git","tag"]): 342 tag = line.strip() 343 gitTags.add(tag) 344return gitTags 345 346defdiffTreePattern(): 347# This is a simple generator for the diff tree regex pattern. This could be 348# a class variable if this and parseDiffTreeEntry were a part of a class. 349 pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)') 350while True: 351yield pattern 352 353defparseDiffTreeEntry(entry): 354"""Parses a single diff tree entry into its component elements. 355 356 See git-diff-tree(1) manpage for details about the format of the diff 357 output. This method returns a dictionary with the following elements: 358 359 src_mode - The mode of the source file 360 dst_mode - The mode of the destination file 361 src_sha1 - The sha1 for the source file 362 dst_sha1 - The sha1 fr the destination file 363 status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc) 364 status_score - The score for the status (applicable for 'C' and 'R' 365 statuses). This is None if there is no score. 366 src - The path for the source file. 367 dst - The path for the destination file. This is only present for 368 copy or renames. If it is not present, this is None. 369 370 If the pattern is not matched, None is returned.""" 371 372 match =diffTreePattern().next().match(entry) 373if match: 374return{ 375'src_mode': match.group(1), 376'dst_mode': match.group(2), 377'src_sha1': match.group(3), 378'dst_sha1': match.group(4), 379'status': match.group(5), 380'status_score': match.group(6), 381'src': match.group(7), 382'dst': match.group(10) 383} 384return None 385 386defisModeExec(mode): 387# Returns True if the given git mode represents an executable file, 388# otherwise False. 389return mode[-3:] =="755" 390 391defisModeExecChanged(src_mode, dst_mode): 392returnisModeExec(src_mode) !=isModeExec(dst_mode) 393 394defp4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None): 395 396ifisinstance(cmd,basestring): 397 cmd ="-G "+ cmd 398 expand =True 399else: 400 cmd = ["-G"] + cmd 401 expand =False 402 403 cmd =p4_build_cmd(cmd) 404if verbose: 405 sys.stderr.write("Opening pipe:%s\n"%str(cmd)) 406 407# Use a temporary file to avoid deadlocks without 408# subprocess.communicate(), which would put another copy 409# of stdout into memory. 410 stdin_file =None 411if stdin is not None: 412 stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode) 413ifisinstance(stdin,basestring): 414 stdin_file.write(stdin) 415else: 416for i in stdin: 417 stdin_file.write(i +'\n') 418 stdin_file.flush() 419 stdin_file.seek(0) 420 421 p4 = subprocess.Popen(cmd, 422 shell=expand, 423 stdin=stdin_file, 424 stdout=subprocess.PIPE) 425 426 result = [] 427try: 428while True: 429 entry = marshal.load(p4.stdout) 430if cb is not None: 431cb(entry) 432else: 433 result.append(entry) 434exceptEOFError: 435pass 436 exitCode = p4.wait() 437if exitCode !=0: 438 entry = {} 439 entry["p4ExitCode"] = exitCode 440 result.append(entry) 441 442return result 443 444defp4Cmd(cmd): 445list=p4CmdList(cmd) 446 result = {} 447for entry inlist: 448 result.update(entry) 449return result; 450 451defp4Where(depotPath): 452if not depotPath.endswith("/"): 453 depotPath +="/" 454 depotPath = depotPath +"..." 455 outputList =p4CmdList(["where", depotPath]) 456 output =None 457for entry in outputList: 458if"depotFile"in entry: 459if entry["depotFile"] == depotPath: 460 output = entry 461break 462elif"data"in entry: 463 data = entry.get("data") 464 space = data.find(" ") 465if data[:space] == depotPath: 466 output = entry 467break 468if output ==None: 469return"" 470if output["code"] =="error": 471return"" 472 clientPath ="" 473if"path"in output: 474 clientPath = output.get("path") 475elif"data"in output: 476 data = output.get("data") 477 lastSpace = data.rfind(" ") 478 clientPath = data[lastSpace +1:] 479 480if clientPath.endswith("..."): 481 clientPath = clientPath[:-3] 482return clientPath 483 484defcurrentGitBranch(): 485returnread_pipe("git name-rev HEAD").split(" ")[1].strip() 486 487defisValidGitDir(path): 488if(os.path.exists(path +"/HEAD") 489and os.path.exists(path +"/refs")and os.path.exists(path +"/objects")): 490return True; 491return False 492 493defparseRevision(ref): 494returnread_pipe("git rev-parse%s"% ref).strip() 495 496defbranchExists(ref): 497 rev =read_pipe(["git","rev-parse","-q","--verify", ref], 498 ignore_error=True) 499returnlen(rev) >0 500 501defextractLogMessageFromGitCommit(commit): 502 logMessage ="" 503 504## fixme: title is first line of commit, not 1st paragraph. 505 foundTitle =False 506for log inread_pipe_lines("git cat-file commit%s"% commit): 507if not foundTitle: 508iflen(log) ==1: 509 foundTitle =True 510continue 511 512 logMessage += log 513return logMessage 514 515defextractSettingsGitLog(log): 516 values = {} 517for line in log.split("\n"): 518 line = line.strip() 519 m = re.search(r"^ *\[git-p4: (.*)\]$", line) 520if not m: 521continue 522 523 assignments = m.group(1).split(':') 524for a in assignments: 525 vals = a.split('=') 526 key = vals[0].strip() 527 val = ('='.join(vals[1:])).strip() 528if val.endswith('\"')and val.startswith('"'): 529 val = val[1:-1] 530 531 values[key] = val 532 533 paths = values.get("depot-paths") 534if not paths: 535 paths = values.get("depot-path") 536if paths: 537 values['depot-paths'] = paths.split(',') 538return values 539 540defgitBranchExists(branch): 541 proc = subprocess.Popen(["git","rev-parse", branch], 542 stderr=subprocess.PIPE, stdout=subprocess.PIPE); 543return proc.wait() ==0; 544 545_gitConfig = {} 546defgitConfig(key, args =None):# set args to "--bool", for instance 547if not _gitConfig.has_key(key): 548 argsFilter ="" 549if args !=None: 550 argsFilter ="%s"% args 551 cmd ="git config%s%s"% (argsFilter, key) 552 _gitConfig[key] =read_pipe(cmd, ignore_error=True).strip() 553return _gitConfig[key] 554 555defgitConfigList(key): 556if not _gitConfig.has_key(key): 557 _gitConfig[key] =read_pipe("git config --get-all%s"% key, ignore_error=True).strip().split(os.linesep) 558return _gitConfig[key] 559 560defp4BranchesInGit(branchesAreInRemotes=True): 561"""Find all the branches whose names start with "p4/", looking 562 in remotes or heads as specified by the argument. Return 563 a dictionary of{ branch: revision }for each one found. 564 The branch names are the short names, without any 565 "p4/" prefix.""" 566 567 branches = {} 568 569 cmdline ="git rev-parse --symbolic " 570if branchesAreInRemotes: 571 cmdline +="--remotes" 572else: 573 cmdline +="--branches" 574 575for line inread_pipe_lines(cmdline): 576 line = line.strip() 577 578# only import to p4/ 579if not line.startswith('p4/'): 580continue 581# special symbolic ref to p4/master 582if line =="p4/HEAD": 583continue 584 585# strip off p4/ prefix 586 branch = line[len("p4/"):] 587 588 branches[branch] =parseRevision(line) 589 590return branches 591 592defbranch_exists(branch): 593"""Make sure that the given ref name really exists.""" 594 595 cmd = ["git","rev-parse","--symbolic","--verify", branch ] 596 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 597 out, _ = p.communicate() 598if p.returncode: 599return False 600# expect exactly one line of output: the branch name 601return out.rstrip() == branch 602 603deffindUpstreamBranchPoint(head ="HEAD"): 604 branches =p4BranchesInGit() 605# map from depot-path to branch name 606 branchByDepotPath = {} 607for branch in branches.keys(): 608 tip = branches[branch] 609 log =extractLogMessageFromGitCommit(tip) 610 settings =extractSettingsGitLog(log) 611if settings.has_key("depot-paths"): 612 paths =",".join(settings["depot-paths"]) 613 branchByDepotPath[paths] ="remotes/p4/"+ branch 614 615 settings =None 616 parent =0 617while parent <65535: 618 commit = head +"~%s"% parent 619 log =extractLogMessageFromGitCommit(commit) 620 settings =extractSettingsGitLog(log) 621if settings.has_key("depot-paths"): 622 paths =",".join(settings["depot-paths"]) 623if branchByDepotPath.has_key(paths): 624return[branchByDepotPath[paths], settings] 625 626 parent = parent +1 627 628return["", settings] 629 630defcreateOrUpdateBranchesFromOrigin(localRefPrefix ="refs/remotes/p4/", silent=True): 631if not silent: 632print("Creating/updating branch(es) in%sbased on origin branch(es)" 633% localRefPrefix) 634 635 originPrefix ="origin/p4/" 636 637for line inread_pipe_lines("git rev-parse --symbolic --remotes"): 638 line = line.strip() 639if(not line.startswith(originPrefix))or line.endswith("HEAD"): 640continue 641 642 headName = line[len(originPrefix):] 643 remoteHead = localRefPrefix + headName 644 originHead = line 645 646 original =extractSettingsGitLog(extractLogMessageFromGitCommit(originHead)) 647if(not original.has_key('depot-paths') 648or not original.has_key('change')): 649continue 650 651 update =False 652if notgitBranchExists(remoteHead): 653if verbose: 654print"creating%s"% remoteHead 655 update =True 656else: 657 settings =extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead)) 658if settings.has_key('change') >0: 659if settings['depot-paths'] == original['depot-paths']: 660 originP4Change =int(original['change']) 661 p4Change =int(settings['change']) 662if originP4Change > p4Change: 663print("%s(%s) is newer than%s(%s). " 664"Updating p4 branch from origin." 665% (originHead, originP4Change, 666 remoteHead, p4Change)) 667 update =True 668else: 669print("Ignoring:%swas imported from%swhile " 670"%swas imported from%s" 671% (originHead,','.join(original['depot-paths']), 672 remoteHead,','.join(settings['depot-paths']))) 673 674if update: 675system("git update-ref%s %s"% (remoteHead, originHead)) 676 677deforiginP4BranchesExist(): 678returngitBranchExists("origin")orgitBranchExists("origin/p4")orgitBranchExists("origin/p4/master") 679 680defp4ChangesForPaths(depotPaths, changeRange): 681assert depotPaths 682 cmd = ['changes'] 683for p in depotPaths: 684 cmd += ["%s...%s"% (p, changeRange)] 685 output =p4_read_pipe_lines(cmd) 686 687 changes = {} 688for line in output: 689 changeNum =int(line.split(" ")[1]) 690 changes[changeNum] =True 691 692 changelist = changes.keys() 693 changelist.sort() 694return changelist 695 696defp4PathStartsWith(path, prefix): 697# This method tries to remedy a potential mixed-case issue: 698# 699# If UserA adds //depot/DirA/file1 700# and UserB adds //depot/dira/file2 701# 702# we may or may not have a problem. If you have core.ignorecase=true, 703# we treat DirA and dira as the same directory 704 ignorecase =gitConfig("core.ignorecase","--bool") =="true" 705if ignorecase: 706return path.lower().startswith(prefix.lower()) 707return path.startswith(prefix) 708 709defgetClientSpec(): 710"""Look at the p4 client spec, create a View() object that contains 711 all the mappings, and return it.""" 712 713 specList =p4CmdList("client -o") 714iflen(specList) !=1: 715die('Output from "client -o" is%dlines, expecting 1'% 716len(specList)) 717 718# dictionary of all client parameters 719 entry = specList[0] 720 721# just the keys that start with "View" 722 view_keys = [ k for k in entry.keys()if k.startswith("View") ] 723 724# hold this new View 725 view =View() 726 727# append the lines, in order, to the view 728for view_num inrange(len(view_keys)): 729 k ="View%d"% view_num 730if k not in view_keys: 731die("Expected view key%smissing"% k) 732 view.append(entry[k]) 733 734return view 735 736defgetClientRoot(): 737"""Grab the client directory.""" 738 739 output =p4CmdList("client -o") 740iflen(output) !=1: 741die('Output from "client -o" is%dlines, expecting 1'%len(output)) 742 743 entry = output[0] 744if"Root"not in entry: 745die('Client has no "Root"') 746 747return entry["Root"] 748 749# 750# P4 wildcards are not allowed in filenames. P4 complains 751# if you simply add them, but you can force it with "-f", in 752# which case it translates them into %xx encoding internally. 753# 754defwildcard_decode(path): 755# Search for and fix just these four characters. Do % last so 756# that fixing it does not inadvertently create new %-escapes. 757# Cannot have * in a filename in windows; untested as to 758# what p4 would do in such a case. 759if not platform.system() =="Windows": 760 path = path.replace("%2A","*") 761 path = path.replace("%23","#") \ 762.replace("%40","@") \ 763.replace("%25","%") 764return path 765 766defwildcard_encode(path): 767# do % first to avoid double-encoding the %s introduced here 768 path = path.replace("%","%25") \ 769.replace("*","%2A") \ 770.replace("#","%23") \ 771.replace("@","%40") 772return path 773 774defwildcard_present(path): 775return path.translate(None,"*#@%") != path 776 777class Command: 778def__init__(self): 779 self.usage ="usage: %prog [options]" 780 self.needsGit =True 781 self.verbose =False 782 783class P4UserMap: 784def__init__(self): 785 self.userMapFromPerforceServer =False 786 self.myP4UserId =None 787 788defp4UserId(self): 789if self.myP4UserId: 790return self.myP4UserId 791 792 results =p4CmdList("user -o") 793for r in results: 794if r.has_key('User'): 795 self.myP4UserId = r['User'] 796return r['User'] 797die("Could not find your p4 user id") 798 799defp4UserIsMe(self, p4User): 800# return True if the given p4 user is actually me 801 me = self.p4UserId() 802if not p4User or p4User != me: 803return False 804else: 805return True 806 807defgetUserCacheFilename(self): 808 home = os.environ.get("HOME", os.environ.get("USERPROFILE")) 809return home +"/.gitp4-usercache.txt" 810 811defgetUserMapFromPerforceServer(self): 812if self.userMapFromPerforceServer: 813return 814 self.users = {} 815 self.emails = {} 816 817for output inp4CmdList("users"): 818if not output.has_key("User"): 819continue 820 self.users[output["User"]] = output["FullName"] +" <"+ output["Email"] +">" 821 self.emails[output["Email"]] = output["User"] 822 823 824 s ='' 825for(key, val)in self.users.items(): 826 s +="%s\t%s\n"% (key.expandtabs(1), val.expandtabs(1)) 827 828open(self.getUserCacheFilename(),"wb").write(s) 829 self.userMapFromPerforceServer =True 830 831defloadUserMapFromCache(self): 832 self.users = {} 833 self.userMapFromPerforceServer =False 834try: 835 cache =open(self.getUserCacheFilename(),"rb") 836 lines = cache.readlines() 837 cache.close() 838for line in lines: 839 entry = line.strip().split("\t") 840 self.users[entry[0]] = entry[1] 841exceptIOError: 842 self.getUserMapFromPerforceServer() 843 844classP4Debug(Command): 845def__init__(self): 846 Command.__init__(self) 847 self.options = [] 848 self.description ="A tool to debug the output of p4 -G." 849 self.needsGit =False 850 851defrun(self, args): 852 j =0 853for output inp4CmdList(args): 854print'Element:%d'% j 855 j +=1 856print output 857return True 858 859classP4RollBack(Command): 860def__init__(self): 861 Command.__init__(self) 862 self.options = [ 863 optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true") 864] 865 self.description ="A tool to debug the multi-branch import. Don't use :)" 866 self.rollbackLocalBranches =False 867 868defrun(self, args): 869iflen(args) !=1: 870return False 871 maxChange =int(args[0]) 872 873if"p4ExitCode"inp4Cmd("changes -m 1"): 874die("Problems executing p4"); 875 876if self.rollbackLocalBranches: 877 refPrefix ="refs/heads/" 878 lines =read_pipe_lines("git rev-parse --symbolic --branches") 879else: 880 refPrefix ="refs/remotes/" 881 lines =read_pipe_lines("git rev-parse --symbolic --remotes") 882 883for line in lines: 884if self.rollbackLocalBranches or(line.startswith("p4/")and line !="p4/HEAD\n"): 885 line = line.strip() 886 ref = refPrefix + line 887 log =extractLogMessageFromGitCommit(ref) 888 settings =extractSettingsGitLog(log) 889 890 depotPaths = settings['depot-paths'] 891 change = settings['change'] 892 893 changed =False 894 895iflen(p4Cmd("changes -m 1 "+' '.join(['%s...@%s'% (p, maxChange) 896for p in depotPaths]))) ==0: 897print"Branch%sdid not exist at change%s, deleting."% (ref, maxChange) 898system("git update-ref -d%s`git rev-parse%s`"% (ref, ref)) 899continue 900 901while change andint(change) > maxChange: 902 changed =True 903if self.verbose: 904print"%sis at%s; rewinding towards%s"% (ref, change, maxChange) 905system("git update-ref%s\"%s^\""% (ref, ref)) 906 log =extractLogMessageFromGitCommit(ref) 907 settings =extractSettingsGitLog(log) 908 909 910 depotPaths = settings['depot-paths'] 911 change = settings['change'] 912 913if changed: 914print"%srewound to%s"% (ref, change) 915 916return True 917 918classP4Submit(Command, P4UserMap): 919 920 conflict_behavior_choices = ("ask","skip","quit") 921 922def__init__(self): 923 Command.__init__(self) 924 P4UserMap.__init__(self) 925 self.options = [ 926 optparse.make_option("--origin", dest="origin"), 927 optparse.make_option("-M", dest="detectRenames", action="store_true"), 928# preserve the user, requires relevant p4 permissions 929 optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"), 930 optparse.make_option("--export-labels", dest="exportLabels", action="store_true"), 931 optparse.make_option("--dry-run","-n", dest="dry_run", action="store_true"), 932 optparse.make_option("--prepare-p4-only", dest="prepare_p4_only", action="store_true"), 933 optparse.make_option("--conflict", dest="conflict_behavior", 934 choices=self.conflict_behavior_choices), 935 optparse.make_option("--branch", dest="branch"), 936] 937 self.description ="Submit changes from git to the perforce depot." 938 self.usage +=" [name of git branch to submit into perforce depot]" 939 self.origin ="" 940 self.detectRenames =False 941 self.preserveUser =gitConfig("git-p4.preserveUser").lower() =="true" 942 self.dry_run =False 943 self.prepare_p4_only =False 944 self.conflict_behavior =None 945 self.isWindows = (platform.system() =="Windows") 946 self.exportLabels =False 947 self.p4HasMoveCommand =p4_has_move_command() 948 self.branch =None 949 950defcheck(self): 951iflen(p4CmdList("opened ...")) >0: 952die("You have files opened with perforce! Close them before starting the sync.") 953 954defseparate_jobs_from_description(self, message): 955"""Extract and return a possible Jobs field in the commit 956 message. It goes into a separate section in the p4 change 957 specification. 958 959 A jobs line starts with "Jobs:" and looks like a new field 960 in a form. Values are white-space separated on the same 961 line or on following lines that start with a tab. 962 963 This does not parse and extract the full git commit message 964 like a p4 form. It just sees the Jobs: line as a marker 965 to pass everything from then on directly into the p4 form, 966 but outside the description section. 967 968 Return a tuple (stripped log message, jobs string).""" 969 970 m = re.search(r'^Jobs:', message, re.MULTILINE) 971if m is None: 972return(message,None) 973 974 jobtext = message[m.start():] 975 stripped_message = message[:m.start()].rstrip() 976return(stripped_message, jobtext) 977 978defprepareLogMessage(self, template, message, jobs): 979"""Edits the template returned from "p4 change -o" to insert 980 the message in the Description field, and the jobs text in 981 the Jobs field.""" 982 result ="" 983 984 inDescriptionSection =False 985 986for line in template.split("\n"): 987if line.startswith("#"): 988 result += line +"\n" 989continue 990 991if inDescriptionSection: 992if line.startswith("Files:")or line.startswith("Jobs:"): 993 inDescriptionSection =False 994# insert Jobs section 995if jobs: 996 result += jobs +"\n" 997else: 998continue 999else:1000if line.startswith("Description:"):1001 inDescriptionSection =True1002 line +="\n"1003for messageLine in message.split("\n"):1004 line +="\t"+ messageLine +"\n"10051006 result += line +"\n"10071008return result10091010defpatchRCSKeywords(self,file, pattern):1011# Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern1012(handle, outFileName) = tempfile.mkstemp(dir='.')1013try:1014 outFile = os.fdopen(handle,"w+")1015 inFile =open(file,"r")1016 regexp = re.compile(pattern, re.VERBOSE)1017for line in inFile.readlines():1018 line = regexp.sub(r'$\1$', line)1019 outFile.write(line)1020 inFile.close()1021 outFile.close()1022# Forcibly overwrite the original file1023 os.unlink(file)1024 shutil.move(outFileName,file)1025except:1026# cleanup our temporary file1027 os.unlink(outFileName)1028print"Failed to strip RCS keywords in%s"%file1029raise10301031print"Patched up RCS keywords in%s"%file10321033defp4UserForCommit(self,id):1034# Return the tuple (perforce user,git email) for a given git commit id1035 self.getUserMapFromPerforceServer()1036 gitEmail =read_pipe("git log --max-count=1 --format='%%ae'%s"%id)1037 gitEmail = gitEmail.strip()1038if not self.emails.has_key(gitEmail):1039return(None,gitEmail)1040else:1041return(self.emails[gitEmail],gitEmail)10421043defcheckValidP4Users(self,commits):1044# check if any git authors cannot be mapped to p4 users1045foridin commits:1046(user,email) = self.p4UserForCommit(id)1047if not user:1048 msg ="Cannot find p4 user for email%sin commit%s."% (email,id)1049ifgitConfig('git-p4.allowMissingP4Users').lower() =="true":1050print"%s"% msg1051else:1052die("Error:%s\nSet git-p4.allowMissingP4Users to true to allow this."% msg)10531054deflastP4Changelist(self):1055# Get back the last changelist number submitted in this client spec. This1056# then gets used to patch up the username in the change. If the same1057# client spec is being used by multiple processes then this might go1058# wrong.1059 results =p4CmdList("client -o")# find the current client1060 client =None1061for r in results:1062if r.has_key('Client'):1063 client = r['Client']1064break1065if not client:1066die("could not get client spec")1067 results =p4CmdList(["changes","-c", client,"-m","1"])1068for r in results:1069if r.has_key('change'):1070return r['change']1071die("Could not get changelist number for last submit - cannot patch up user details")10721073defmodifyChangelistUser(self, changelist, newUser):1074# fixup the user field of a changelist after it has been submitted.1075 changes =p4CmdList("change -o%s"% changelist)1076iflen(changes) !=1:1077die("Bad output from p4 change modifying%sto user%s"%1078(changelist, newUser))10791080 c = changes[0]1081if c['User'] == newUser:return# nothing to do1082 c['User'] = newUser1083input= marshal.dumps(c)10841085 result =p4CmdList("change -f -i", stdin=input)1086for r in result:1087if r.has_key('code'):1088if r['code'] =='error':1089die("Could not modify user field of changelist%sto%s:%s"% (changelist, newUser, r['data']))1090if r.has_key('data'):1091print("Updated user field for changelist%sto%s"% (changelist, newUser))1092return1093die("Could not modify user field of changelist%sto%s"% (changelist, newUser))10941095defcanChangeChangelists(self):1096# check to see if we have p4 admin or super-user permissions, either of1097# which are required to modify changelists.1098 results =p4CmdList(["protects", self.depotPath])1099for r in results:1100if r.has_key('perm'):1101if r['perm'] =='admin':1102return11103if r['perm'] =='super':1104return11105return011061107defprepareSubmitTemplate(self):1108"""Run "p4 change -o" to grab a change specification template.1109 This does not use "p4 -G", as it is nice to keep the submission1110 template in original order, since a human might edit it.11111112 Remove lines in the Files section that show changes to files1113 outside the depot path we're committing into."""11141115 template =""1116 inFilesSection =False1117for line inp4_read_pipe_lines(['change','-o']):1118if line.endswith("\r\n"):1119 line = line[:-2] +"\n"1120if inFilesSection:1121if line.startswith("\t"):1122# path starts and ends with a tab1123 path = line[1:]1124 lastTab = path.rfind("\t")1125if lastTab != -1:1126 path = path[:lastTab]1127if notp4PathStartsWith(path, self.depotPath):1128continue1129else:1130 inFilesSection =False1131else:1132if line.startswith("Files:"):1133 inFilesSection =True11341135 template += line11361137return template11381139defedit_template(self, template_file):1140"""Invoke the editor to let the user change the submission1141 message. Return true if okay to continue with the submit."""11421143# if configured to skip the editing part, just submit1144ifgitConfig("git-p4.skipSubmitEdit") =="true":1145return True11461147# look at the modification time, to check later if the user saved1148# the file1149 mtime = os.stat(template_file).st_mtime11501151# invoke the editor1152if os.environ.has_key("P4EDITOR")and(os.environ.get("P4EDITOR") !=""):1153 editor = os.environ.get("P4EDITOR")1154else:1155 editor =read_pipe("git var GIT_EDITOR").strip()1156system(editor +" "+ template_file)11571158# If the file was not saved, prompt to see if this patch should1159# be skipped. But skip this verification step if configured so.1160ifgitConfig("git-p4.skipSubmitEditCheck") =="true":1161return True11621163# modification time updated means user saved the file1164if os.stat(template_file).st_mtime > mtime:1165return True11661167while True:1168 response =raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")1169if response =='y':1170return True1171if response =='n':1172return False11731174defapplyCommit(self,id):1175"""Apply one commit, return True if it succeeded."""11761177print"Applying",read_pipe(["git","show","-s",1178"--format=format:%h%s",id])11791180(p4User, gitEmail) = self.p4UserForCommit(id)11811182 diff =read_pipe_lines("git diff-tree -r%s\"%s^\" \"%s\""% (self.diffOpts,id,id))1183 filesToAdd =set()1184 filesToDelete =set()1185 editedFiles =set()1186 pureRenameCopy =set()1187 filesToChangeExecBit = {}11881189for line in diff:1190 diff =parseDiffTreeEntry(line)1191 modifier = diff['status']1192 path = diff['src']1193if modifier =="M":1194p4_edit(path)1195ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1196 filesToChangeExecBit[path] = diff['dst_mode']1197 editedFiles.add(path)1198elif modifier =="A":1199 filesToAdd.add(path)1200 filesToChangeExecBit[path] = diff['dst_mode']1201if path in filesToDelete:1202 filesToDelete.remove(path)1203elif modifier =="D":1204 filesToDelete.add(path)1205if path in filesToAdd:1206 filesToAdd.remove(path)1207elif modifier =="C":1208 src, dest = diff['src'], diff['dst']1209p4_integrate(src, dest)1210 pureRenameCopy.add(dest)1211if diff['src_sha1'] != diff['dst_sha1']:1212p4_edit(dest)1213 pureRenameCopy.discard(dest)1214ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1215p4_edit(dest)1216 pureRenameCopy.discard(dest)1217 filesToChangeExecBit[dest] = diff['dst_mode']1218 os.unlink(dest)1219 editedFiles.add(dest)1220elif modifier =="R":1221 src, dest = diff['src'], diff['dst']1222if self.p4HasMoveCommand:1223p4_edit(src)# src must be open before move1224p4_move(src, dest)# opens for (move/delete, move/add)1225else:1226p4_integrate(src, dest)1227if diff['src_sha1'] != diff['dst_sha1']:1228p4_edit(dest)1229else:1230 pureRenameCopy.add(dest)1231ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1232if not self.p4HasMoveCommand:1233p4_edit(dest)# with move: already open, writable1234 filesToChangeExecBit[dest] = diff['dst_mode']1235if not self.p4HasMoveCommand:1236 os.unlink(dest)1237 filesToDelete.add(src)1238 editedFiles.add(dest)1239else:1240die("unknown modifier%sfor%s"% (modifier, path))12411242 diffcmd ="git format-patch -k --stdout\"%s^\"..\"%s\""% (id,id)1243 patchcmd = diffcmd +" | git apply "1244 tryPatchCmd = patchcmd +"--check -"1245 applyPatchCmd = patchcmd +"--check --apply -"1246 patch_succeeded =True12471248if os.system(tryPatchCmd) !=0:1249 fixed_rcs_keywords =False1250 patch_succeeded =False1251print"Unfortunately applying the change failed!"12521253# Patch failed, maybe it's just RCS keyword woes. Look through1254# the patch to see if that's possible.1255ifgitConfig("git-p4.attemptRCSCleanup","--bool") =="true":1256file=None1257 pattern =None1258 kwfiles = {}1259forfilein editedFiles | filesToDelete:1260# did this file's delta contain RCS keywords?1261 pattern =p4_keywords_regexp_for_file(file)12621263if pattern:1264# this file is a possibility...look for RCS keywords.1265 regexp = re.compile(pattern, re.VERBOSE)1266for line inread_pipe_lines(["git","diff","%s^..%s"% (id,id),file]):1267if regexp.search(line):1268if verbose:1269print"got keyword match on%sin%sin%s"% (pattern, line,file)1270 kwfiles[file] = pattern1271break12721273forfilein kwfiles:1274if verbose:1275print"zapping%swith%s"% (line,pattern)1276 self.patchRCSKeywords(file, kwfiles[file])1277 fixed_rcs_keywords =True12781279if fixed_rcs_keywords:1280print"Retrying the patch with RCS keywords cleaned up"1281if os.system(tryPatchCmd) ==0:1282 patch_succeeded =True12831284if not patch_succeeded:1285for f in editedFiles:1286p4_revert(f)1287return False12881289#1290# Apply the patch for real, and do add/delete/+x handling.1291#1292system(applyPatchCmd)12931294for f in filesToAdd:1295p4_add(f)1296for f in filesToDelete:1297p4_revert(f)1298p4_delete(f)12991300# Set/clear executable bits1301for f in filesToChangeExecBit.keys():1302 mode = filesToChangeExecBit[f]1303setP4ExecBit(f, mode)13041305#1306# Build p4 change description, starting with the contents1307# of the git commit message.1308#1309 logMessage =extractLogMessageFromGitCommit(id)1310 logMessage = logMessage.strip()1311(logMessage, jobs) = self.separate_jobs_from_description(logMessage)13121313 template = self.prepareSubmitTemplate()1314 submitTemplate = self.prepareLogMessage(template, logMessage, jobs)13151316if self.preserveUser:1317 submitTemplate +="\n######## Actual user%s, modified after commit\n"% p4User13181319if self.checkAuthorship and not self.p4UserIsMe(p4User):1320 submitTemplate +="######## git author%sdoes not match your p4 account.\n"% gitEmail1321 submitTemplate +="######## Use option --preserve-user to modify authorship.\n"1322 submitTemplate +="######## Variable git-p4.skipUserNameCheck hides this message.\n"13231324 separatorLine ="######## everything below this line is just the diff #######\n"13251326# diff1327if os.environ.has_key("P4DIFF"):1328del(os.environ["P4DIFF"])1329 diff =""1330for editedFile in editedFiles:1331 diff +=p4_read_pipe(['diff','-du',1332wildcard_encode(editedFile)])13331334# new file diff1335 newdiff =""1336for newFile in filesToAdd:1337 newdiff +="==== new file ====\n"1338 newdiff +="--- /dev/null\n"1339 newdiff +="+++%s\n"% newFile1340 f =open(newFile,"r")1341for line in f.readlines():1342 newdiff +="+"+ line1343 f.close()13441345# change description file: submitTemplate, separatorLine, diff, newdiff1346(handle, fileName) = tempfile.mkstemp()1347 tmpFile = os.fdopen(handle,"w+")1348if self.isWindows:1349 submitTemplate = submitTemplate.replace("\n","\r\n")1350 separatorLine = separatorLine.replace("\n","\r\n")1351 newdiff = newdiff.replace("\n","\r\n")1352 tmpFile.write(submitTemplate + separatorLine + diff + newdiff)1353 tmpFile.close()13541355if self.prepare_p4_only:1356#1357# Leave the p4 tree prepared, and the submit template around1358# and let the user decide what to do next1359#1360print1361print"P4 workspace prepared for submission."1362print"To submit or revert, go to client workspace"1363print" "+ self.clientPath1364print1365print"To submit, use\"p4 submit\"to write a new description,"1366print"or\"p4 submit -i%s\"to use the one prepared by" \1367"\"git p4\"."% fileName1368print"You can delete the file\"%s\"when finished."% fileName13691370if self.preserveUser and p4User and not self.p4UserIsMe(p4User):1371print"To preserve change ownership by user%s, you must\n" \1372"do\"p4 change -f <change>\"after submitting and\n" \1373"edit the User field."1374if pureRenameCopy:1375print"After submitting, renamed files must be re-synced."1376print"Invoke\"p4 sync -f\"on each of these files:"1377for f in pureRenameCopy:1378print" "+ f13791380print1381print"To revert the changes, use\"p4 revert ...\", and delete"1382print"the submit template file\"%s\""% fileName1383if filesToAdd:1384print"Since the commit adds new files, they must be deleted:"1385for f in filesToAdd:1386print" "+ f1387print1388return True13891390#1391# Let the user edit the change description, then submit it.1392#1393if self.edit_template(fileName):1394# read the edited message and submit1395 ret =True1396 tmpFile =open(fileName,"rb")1397 message = tmpFile.read()1398 tmpFile.close()1399 submitTemplate = message[:message.index(separatorLine)]1400if self.isWindows:1401 submitTemplate = submitTemplate.replace("\r\n","\n")1402p4_write_pipe(['submit','-i'], submitTemplate)14031404if self.preserveUser:1405if p4User:1406# Get last changelist number. Cannot easily get it from1407# the submit command output as the output is1408# unmarshalled.1409 changelist = self.lastP4Changelist()1410 self.modifyChangelistUser(changelist, p4User)14111412# The rename/copy happened by applying a patch that created a1413# new file. This leaves it writable, which confuses p4.1414for f in pureRenameCopy:1415p4_sync(f,"-f")14161417else:1418# skip this patch1419 ret =False1420print"Submission cancelled, undoing p4 changes."1421for f in editedFiles:1422p4_revert(f)1423for f in filesToAdd:1424p4_revert(f)1425 os.remove(f)1426for f in filesToDelete:1427p4_revert(f)14281429 os.remove(fileName)1430return ret14311432# Export git tags as p4 labels. Create a p4 label and then tag1433# with that.1434defexportGitTags(self, gitTags):1435 validLabelRegexp =gitConfig("git-p4.labelExportRegexp")1436iflen(validLabelRegexp) ==0:1437 validLabelRegexp = defaultLabelRegexp1438 m = re.compile(validLabelRegexp)14391440for name in gitTags:14411442if not m.match(name):1443if verbose:1444print"tag%sdoes not match regexp%s"% (name, validLabelRegexp)1445continue14461447# Get the p4 commit this corresponds to1448 logMessage =extractLogMessageFromGitCommit(name)1449 values =extractSettingsGitLog(logMessage)14501451if not values.has_key('change'):1452# a tag pointing to something not sent to p4; ignore1453if verbose:1454print"git tag%sdoes not give a p4 commit"% name1455continue1456else:1457 changelist = values['change']14581459# Get the tag details.1460 inHeader =True1461 isAnnotated =False1462 body = []1463for l inread_pipe_lines(["git","cat-file","-p", name]):1464 l = l.strip()1465if inHeader:1466if re.match(r'tag\s+', l):1467 isAnnotated =True1468elif re.match(r'\s*$', l):1469 inHeader =False1470continue1471else:1472 body.append(l)14731474if not isAnnotated:1475 body = ["lightweight tag imported by git p4\n"]14761477# Create the label - use the same view as the client spec we are using1478 clientSpec =getClientSpec()14791480 labelTemplate ="Label:%s\n"% name1481 labelTemplate +="Description:\n"1482for b in body:1483 labelTemplate +="\t"+ b +"\n"1484 labelTemplate +="View:\n"1485for mapping in clientSpec.mappings:1486 labelTemplate +="\t%s\n"% mapping.depot_side.path14871488if self.dry_run:1489print"Would create p4 label%sfor tag"% name1490elif self.prepare_p4_only:1491print"Not creating p4 label%sfor tag due to option" \1492" --prepare-p4-only"% name1493else:1494p4_write_pipe(["label","-i"], labelTemplate)14951496# Use the label1497p4_system(["tag","-l", name] +1498["%s@%s"% (mapping.depot_side.path, changelist)for mapping in clientSpec.mappings])14991500if verbose:1501print"created p4 label for tag%s"% name15021503defrun(self, args):1504iflen(args) ==0:1505 self.master =currentGitBranch()1506iflen(self.master) ==0or notgitBranchExists("refs/heads/%s"% self.master):1507die("Detecting current git branch failed!")1508eliflen(args) ==1:1509 self.master = args[0]1510if notbranchExists(self.master):1511die("Branch%sdoes not exist"% self.master)1512else:1513return False15141515 allowSubmit =gitConfig("git-p4.allowSubmit")1516iflen(allowSubmit) >0and not self.master in allowSubmit.split(","):1517die("%sis not in git-p4.allowSubmit"% self.master)15181519[upstream, settings] =findUpstreamBranchPoint()1520 self.depotPath = settings['depot-paths'][0]1521iflen(self.origin) ==0:1522 self.origin = upstream15231524if self.preserveUser:1525if not self.canChangeChangelists():1526die("Cannot preserve user names without p4 super-user or admin permissions")15271528# if not set from the command line, try the config file1529if self.conflict_behavior is None:1530 val =gitConfig("git-p4.conflict")1531if val:1532if val not in self.conflict_behavior_choices:1533die("Invalid value '%s' for config git-p4.conflict"% val)1534else:1535 val ="ask"1536 self.conflict_behavior = val15371538if self.verbose:1539print"Origin branch is "+ self.origin15401541iflen(self.depotPath) ==0:1542print"Internal error: cannot locate perforce depot path from existing branches"1543 sys.exit(128)15441545 self.useClientSpec =False1546ifgitConfig("git-p4.useclientspec","--bool") =="true":1547 self.useClientSpec =True1548if self.useClientSpec:1549 self.clientSpecDirs =getClientSpec()15501551if self.useClientSpec:1552# all files are relative to the client spec1553 self.clientPath =getClientRoot()1554else:1555 self.clientPath =p4Where(self.depotPath)15561557if self.clientPath =="":1558die("Error: Cannot locate perforce checkout of%sin client view"% self.depotPath)15591560print"Perforce checkout for depot path%slocated at%s"% (self.depotPath, self.clientPath)1561 self.oldWorkingDirectory = os.getcwd()15621563# ensure the clientPath exists1564 new_client_dir =False1565if not os.path.exists(self.clientPath):1566 new_client_dir =True1567 os.makedirs(self.clientPath)15681569chdir(self.clientPath)1570if self.dry_run:1571print"Would synchronize p4 checkout in%s"% self.clientPath1572else:1573print"Synchronizing p4 checkout..."1574if new_client_dir:1575# old one was destroyed, and maybe nobody told p41576p4_sync("...","-f")1577else:1578p4_sync("...")1579 self.check()15801581 commits = []1582for line inread_pipe_lines("git rev-list --no-merges%s..%s"% (self.origin, self.master)):1583 commits.append(line.strip())1584 commits.reverse()15851586if self.preserveUser or(gitConfig("git-p4.skipUserNameCheck") =="true"):1587 self.checkAuthorship =False1588else:1589 self.checkAuthorship =True15901591if self.preserveUser:1592 self.checkValidP4Users(commits)15931594#1595# Build up a set of options to be passed to diff when1596# submitting each commit to p4.1597#1598if self.detectRenames:1599# command-line -M arg1600 self.diffOpts ="-M"1601else:1602# If not explicitly set check the config variable1603 detectRenames =gitConfig("git-p4.detectRenames")16041605if detectRenames.lower() =="false"or detectRenames =="":1606 self.diffOpts =""1607elif detectRenames.lower() =="true":1608 self.diffOpts ="-M"1609else:1610 self.diffOpts ="-M%s"% detectRenames16111612# no command-line arg for -C or --find-copies-harder, just1613# config variables1614 detectCopies =gitConfig("git-p4.detectCopies")1615if detectCopies.lower() =="false"or detectCopies =="":1616pass1617elif detectCopies.lower() =="true":1618 self.diffOpts +=" -C"1619else:1620 self.diffOpts +=" -C%s"% detectCopies16211622ifgitConfig("git-p4.detectCopiesHarder","--bool") =="true":1623 self.diffOpts +=" --find-copies-harder"16241625#1626# Apply the commits, one at a time. On failure, ask if should1627# continue to try the rest of the patches, or quit.1628#1629if self.dry_run:1630print"Would apply"1631 applied = []1632 last =len(commits) -11633for i, commit inenumerate(commits):1634if self.dry_run:1635print" ",read_pipe(["git","show","-s",1636"--format=format:%h%s", commit])1637 ok =True1638else:1639 ok = self.applyCommit(commit)1640if ok:1641 applied.append(commit)1642else:1643if self.prepare_p4_only and i < last:1644print"Processing only the first commit due to option" \1645" --prepare-p4-only"1646break1647if i < last:1648 quit =False1649while True:1650# prompt for what to do, or use the option/variable1651if self.conflict_behavior =="ask":1652print"What do you want to do?"1653 response =raw_input("[s]kip this commit but apply"1654" the rest, or [q]uit? ")1655if not response:1656continue1657elif self.conflict_behavior =="skip":1658 response ="s"1659elif self.conflict_behavior =="quit":1660 response ="q"1661else:1662die("Unknown conflict_behavior '%s'"%1663 self.conflict_behavior)16641665if response[0] =="s":1666print"Skipping this commit, but applying the rest"1667break1668if response[0] =="q":1669print"Quitting"1670 quit =True1671break1672if quit:1673break16741675chdir(self.oldWorkingDirectory)16761677if self.dry_run:1678pass1679elif self.prepare_p4_only:1680pass1681eliflen(commits) ==len(applied):1682print"All commits applied!"16831684 sync =P4Sync()1685if self.branch:1686 sync.branch = self.branch1687 sync.run([])16881689 rebase =P4Rebase()1690 rebase.rebase()16911692else:1693iflen(applied) ==0:1694print"No commits applied."1695else:1696print"Applied only the commits marked with '*':"1697for c in commits:1698if c in applied:1699 star ="*"1700else:1701 star =" "1702print star,read_pipe(["git","show","-s",1703"--format=format:%h%s", c])1704print"You will have to do 'git p4 sync' and rebase."17051706ifgitConfig("git-p4.exportLabels","--bool") =="true":1707 self.exportLabels =True17081709if self.exportLabels:1710 p4Labels =getP4Labels(self.depotPath)1711 gitTags =getGitTags()17121713 missingGitTags = gitTags - p4Labels1714 self.exportGitTags(missingGitTags)17151716# exit with error unless everything applied perfecly1717iflen(commits) !=len(applied):1718 sys.exit(1)17191720return True17211722classView(object):1723"""Represent a p4 view ("p4 help views"), and map files in a1724 repo according to the view."""17251726classPath(object):1727"""A depot or client path, possibly containing wildcards.1728 The only one supported is ... at the end, currently.1729 Initialize with the full path, with //depot or //client."""17301731def__init__(self, path, is_depot):1732 self.path = path1733 self.is_depot = is_depot1734 self.find_wildcards()1735# remember the prefix bit, useful for relative mappings1736 m = re.match("(//[^/]+/)", self.path)1737if not m:1738die("Path%sdoes not start with //prefix/"% self.path)1739 prefix = m.group(1)1740if not self.is_depot:1741# strip //client/ on client paths1742 self.path = self.path[len(prefix):]17431744deffind_wildcards(self):1745"""Make sure wildcards are valid, and set up internal1746 variables."""17471748 self.ends_triple_dot =False1749# There are three wildcards allowed in p4 views1750# (see "p4 help views"). This code knows how to1751# handle "..." (only at the end), but cannot deal with1752# "%%n" or "*". Only check the depot_side, as p4 should1753# validate that the client_side matches too.1754if re.search(r'%%[1-9]', self.path):1755die("Can't handle%%n wildcards in view:%s"% self.path)1756if self.path.find("*") >=0:1757die("Can't handle * wildcards in view:%s"% self.path)1758 triple_dot_index = self.path.find("...")1759if triple_dot_index >=0:1760if triple_dot_index !=len(self.path) -3:1761die("Can handle only single ... wildcard, at end:%s"%1762 self.path)1763 self.ends_triple_dot =True17641765defensure_compatible(self, other_path):1766"""Make sure the wildcards agree."""1767if self.ends_triple_dot != other_path.ends_triple_dot:1768die("Both paths must end with ... if either does;\n"+1769"paths:%s %s"% (self.path, other_path.path))17701771defmatch_wildcards(self, test_path):1772"""See if this test_path matches us, and fill in the value1773 of the wildcards if so. Returns a tuple of1774 (True|False, wildcards[]). For now, only the ... at end1775 is supported, so at most one wildcard."""1776if self.ends_triple_dot:1777 dotless = self.path[:-3]1778if test_path.startswith(dotless):1779 wildcard = test_path[len(dotless):]1780return(True, [ wildcard ])1781else:1782if test_path == self.path:1783return(True, [])1784return(False, [])17851786defmatch(self, test_path):1787"""Just return if it matches; don't bother with the wildcards."""1788 b, _ = self.match_wildcards(test_path)1789return b17901791deffill_in_wildcards(self, wildcards):1792"""Return the relative path, with the wildcards filled in1793 if there are any."""1794if self.ends_triple_dot:1795return self.path[:-3] + wildcards[0]1796else:1797return self.path17981799classMapping(object):1800def__init__(self, depot_side, client_side, overlay, exclude):1801# depot_side is without the trailing /... if it had one1802 self.depot_side = View.Path(depot_side, is_depot=True)1803 self.client_side = View.Path(client_side, is_depot=False)1804 self.overlay = overlay # started with "+"1805 self.exclude = exclude # started with "-"1806assert not(self.overlay and self.exclude)1807 self.depot_side.ensure_compatible(self.client_side)18081809def__str__(self):1810 c =" "1811if self.overlay:1812 c ="+"1813if self.exclude:1814 c ="-"1815return"View.Mapping:%s%s->%s"% \1816(c, self.depot_side.path, self.client_side.path)18171818defmap_depot_to_client(self, depot_path):1819"""Calculate the client path if using this mapping on the1820 given depot path; does not consider the effect of other1821 mappings in a view. Even excluded mappings are returned."""1822 matches, wildcards = self.depot_side.match_wildcards(depot_path)1823if not matches:1824return""1825 client_path = self.client_side.fill_in_wildcards(wildcards)1826return client_path18271828#1829# View methods1830#1831def__init__(self):1832 self.mappings = []18331834defappend(self, view_line):1835"""Parse a view line, splitting it into depot and client1836 sides. Append to self.mappings, preserving order."""18371838# Split the view line into exactly two words. P4 enforces1839# structure on these lines that simplifies this quite a bit.1840#1841# Either or both words may be double-quoted.1842# Single quotes do not matter.1843# Double-quote marks cannot occur inside the words.1844# A + or - prefix is also inside the quotes.1845# There are no quotes unless they contain a space.1846# The line is already white-space stripped.1847# The two words are separated by a single space.1848#1849if view_line[0] =='"':1850# First word is double quoted. Find its end.1851 close_quote_index = view_line.find('"',1)1852if close_quote_index <=0:1853die("No first-word closing quote found:%s"% view_line)1854 depot_side = view_line[1:close_quote_index]1855# skip closing quote and space1856 rhs_index = close_quote_index +1+11857else:1858 space_index = view_line.find(" ")1859if space_index <=0:1860die("No word-splitting space found:%s"% view_line)1861 depot_side = view_line[0:space_index]1862 rhs_index = space_index +118631864if view_line[rhs_index] =='"':1865# Second word is double quoted. Make sure there is a1866# double quote at the end too.1867if not view_line.endswith('"'):1868die("View line with rhs quote should end with one:%s"%1869 view_line)1870# skip the quotes1871 client_side = view_line[rhs_index+1:-1]1872else:1873 client_side = view_line[rhs_index:]18741875# prefix + means overlay on previous mapping1876 overlay =False1877if depot_side.startswith("+"):1878 overlay =True1879 depot_side = depot_side[1:]18801881# prefix - means exclude this path1882 exclude =False1883if depot_side.startswith("-"):1884 exclude =True1885 depot_side = depot_side[1:]18861887 m = View.Mapping(depot_side, client_side, overlay, exclude)1888 self.mappings.append(m)18891890defmap_in_client(self, depot_path):1891"""Return the relative location in the client where this1892 depot file should live. Returns "" if the file should1893 not be mapped in the client."""18941895 paths_filled = []1896 client_path =""18971898# look at later entries first1899for m in self.mappings[::-1]:19001901# see where will this path end up in the client1902 p = m.map_depot_to_client(depot_path)19031904if p =="":1905# Depot path does not belong in client. Must remember1906# this, as previous items should not cause files to1907# exist in this path either. Remember that the list is1908# being walked from the end, which has higher precedence.1909# Overlap mappings do not exclude previous mappings.1910if not m.overlay:1911 paths_filled.append(m.client_side)19121913else:1914# This mapping matched; no need to search any further.1915# But, the mapping could be rejected if the client path1916# has already been claimed by an earlier mapping (i.e.1917# one later in the list, which we are walking backwards).1918 already_mapped_in_client =False1919for f in paths_filled:1920# this is View.Path.match1921if f.match(p):1922 already_mapped_in_client =True1923break1924if not already_mapped_in_client:1925# Include this file, unless it is from a line that1926# explicitly said to exclude it.1927if not m.exclude:1928 client_path = p19291930# a match, even if rejected, always stops the search1931break19321933return client_path19341935classP4Sync(Command, P4UserMap):1936 delete_actions = ("delete","move/delete","purge")19371938def__init__(self):1939 Command.__init__(self)1940 P4UserMap.__init__(self)1941 self.options = [1942 optparse.make_option("--branch", dest="branch"),1943 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),1944 optparse.make_option("--changesfile", dest="changesFile"),1945 optparse.make_option("--silent", dest="silent", action="store_true"),1946 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),1947 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),1948 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",1949help="Import into refs/heads/ , not refs/remotes"),1950 optparse.make_option("--max-changes", dest="maxChanges"),1951 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',1952help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),1953 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',1954help="Only sync files that are included in the Perforce Client Spec")1955]1956 self.description ="""Imports from Perforce into a git repository.\n1957 example:1958 //depot/my/project/ -- to import the current head1959 //depot/my/project/@all -- to import everything1960 //depot/my/project/@1,6 -- to import only from revision 1 to 619611962 (a ... is not needed in the path p4 specification, it's added implicitly)"""19631964 self.usage +=" //depot/path[@revRange]"1965 self.silent =False1966 self.createdBranches =set()1967 self.committedChanges =set()1968 self.branch =""1969 self.detectBranches =False1970 self.detectLabels =False1971 self.importLabels =False1972 self.changesFile =""1973 self.syncWithOrigin =True1974 self.importIntoRemotes =True1975 self.maxChanges =""1976 self.isWindows = (platform.system() =="Windows")1977 self.keepRepoPath =False1978 self.depotPaths =None1979 self.p4BranchesInGit = []1980 self.cloneExclude = []1981 self.useClientSpec =False1982 self.useClientSpec_from_options =False1983 self.clientSpecDirs =None1984 self.tempBranches = []1985 self.tempBranchLocation ="git-p4-tmp"19861987ifgitConfig("git-p4.syncFromOrigin") =="false":1988 self.syncWithOrigin =False19891990# Force a checkpoint in fast-import and wait for it to finish1991defcheckpoint(self):1992 self.gitStream.write("checkpoint\n\n")1993 self.gitStream.write("progress checkpoint\n\n")1994 out = self.gitOutput.readline()1995if self.verbose:1996print"checkpoint finished: "+ out19971998defextractFilesFromCommit(self, commit):1999 self.cloneExclude = [re.sub(r"\.\.\.$","", path)2000for path in self.cloneExclude]2001 files = []2002 fnum =02003while commit.has_key("depotFile%s"% fnum):2004 path = commit["depotFile%s"% fnum]20052006if[p for p in self.cloneExclude2007ifp4PathStartsWith(path, p)]:2008 found =False2009else:2010 found = [p for p in self.depotPaths2011ifp4PathStartsWith(path, p)]2012if not found:2013 fnum = fnum +12014continue20152016file= {}2017file["path"] = path2018file["rev"] = commit["rev%s"% fnum]2019file["action"] = commit["action%s"% fnum]2020file["type"] = commit["type%s"% fnum]2021 files.append(file)2022 fnum = fnum +12023return files20242025defstripRepoPath(self, path, prefixes):2026"""When streaming files, this is called to map a p4 depot path2027 to where it should go in git. The prefixes are either2028 self.depotPaths, or self.branchPrefixes in the case of2029 branch detection."""20302031if self.useClientSpec:2032# branch detection moves files up a level (the branch name)2033# from what client spec interpretation gives2034 path = self.clientSpecDirs.map_in_client(path)2035if self.detectBranches:2036for b in self.knownBranches:2037if path.startswith(b +"/"):2038 path = path[len(b)+1:]20392040elif self.keepRepoPath:2041# Preserve everything in relative path name except leading2042# //depot/; just look at first prefix as they all should2043# be in the same depot.2044 depot = re.sub("^(//[^/]+/).*", r'\1', prefixes[0])2045ifp4PathStartsWith(path, depot):2046 path = path[len(depot):]20472048else:2049for p in prefixes:2050ifp4PathStartsWith(path, p):2051 path = path[len(p):]2052break20532054 path =wildcard_decode(path)2055return path20562057defsplitFilesIntoBranches(self, commit):2058"""Look at each depotFile in the commit to figure out to what2059 branch it belongs."""20602061 branches = {}2062 fnum =02063while commit.has_key("depotFile%s"% fnum):2064 path = commit["depotFile%s"% fnum]2065 found = [p for p in self.depotPaths2066ifp4PathStartsWith(path, p)]2067if not found:2068 fnum = fnum +12069continue20702071file= {}2072file["path"] = path2073file["rev"] = commit["rev%s"% fnum]2074file["action"] = commit["action%s"% fnum]2075file["type"] = commit["type%s"% fnum]2076 fnum = fnum +120772078# start with the full relative path where this file would2079# go in a p4 client2080if self.useClientSpec:2081 relPath = self.clientSpecDirs.map_in_client(path)2082else:2083 relPath = self.stripRepoPath(path, self.depotPaths)20842085for branch in self.knownBranches.keys():2086# add a trailing slash so that a commit into qt/4.2foo2087# doesn't end up in qt/4.2, e.g.2088if relPath.startswith(branch +"/"):2089if branch not in branches:2090 branches[branch] = []2091 branches[branch].append(file)2092break20932094return branches20952096# output one file from the P4 stream2097# - helper for streamP4Files20982099defstreamOneP4File(self,file, contents):2100 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)2101if verbose:2102 sys.stderr.write("%s\n"% relPath)21032104(type_base, type_mods) =split_p4_type(file["type"])21052106 git_mode ="100644"2107if"x"in type_mods:2108 git_mode ="100755"2109if type_base =="symlink":2110 git_mode ="120000"2111# p4 print on a symlink contains "target\n"; remove the newline2112 data =''.join(contents)2113 contents = [data[:-1]]21142115if type_base =="utf16":2116# p4 delivers different text in the python output to -G2117# than it does when using "print -o", or normal p4 client2118# operations. utf16 is converted to ascii or utf8, perhaps.2119# But ascii text saved as -t utf16 is completely mangled.2120# Invoke print -o to get the real contents.2121 text =p4_read_pipe(['print','-q','-o','-',file['depotFile']])2122 contents = [ text ]21232124if type_base =="apple":2125# Apple filetype files will be streamed as a concatenation of2126# its appledouble header and the contents. This is useless2127# on both macs and non-macs. If using "print -q -o xx", it2128# will create "xx" with the data, and "%xx" with the header.2129# This is also not very useful.2130#2131# Ideally, someday, this script can learn how to generate2132# appledouble files directly and import those to git, but2133# non-mac machines can never find a use for apple filetype.2134print"\nIgnoring apple filetype file%s"%file['depotFile']2135return21362137# Note that we do not try to de-mangle keywords on utf16 files,2138# even though in theory somebody may want that.2139 pattern =p4_keywords_regexp_for_type(type_base, type_mods)2140if pattern:2141 regexp = re.compile(pattern, re.VERBOSE)2142 text =''.join(contents)2143 text = regexp.sub(r'$\1$', text)2144 contents = [ text ]21452146 self.gitStream.write("M%sinline%s\n"% (git_mode, relPath))21472148# total length...2149 length =02150for d in contents:2151 length = length +len(d)21522153 self.gitStream.write("data%d\n"% length)2154for d in contents:2155 self.gitStream.write(d)2156 self.gitStream.write("\n")21572158defstreamOneP4Deletion(self,file):2159 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)2160if verbose:2161 sys.stderr.write("delete%s\n"% relPath)2162 self.gitStream.write("D%s\n"% relPath)21632164# handle another chunk of streaming data2165defstreamP4FilesCb(self, marshalled):21662167# catch p4 errors and complain2168 err =None2169if"code"in marshalled:2170if marshalled["code"] =="error":2171if"data"in marshalled:2172 err = marshalled["data"].rstrip()2173if err:2174 f =None2175if self.stream_have_file_info:2176if"depotFile"in self.stream_file:2177 f = self.stream_file["depotFile"]2178# force a failure in fast-import, else an empty2179# commit will be made2180 self.gitStream.write("\n")2181 self.gitStream.write("die-now\n")2182 self.gitStream.close()2183# ignore errors, but make sure it exits first2184 self.importProcess.wait()2185if f:2186die("Error from p4 print for%s:%s"% (f, err))2187else:2188die("Error from p4 print:%s"% err)21892190if marshalled.has_key('depotFile')and self.stream_have_file_info:2191# start of a new file - output the old one first2192 self.streamOneP4File(self.stream_file, self.stream_contents)2193 self.stream_file = {}2194 self.stream_contents = []2195 self.stream_have_file_info =False21962197# pick up the new file information... for the2198# 'data' field we need to append to our array2199for k in marshalled.keys():2200if k =='data':2201 self.stream_contents.append(marshalled['data'])2202else:2203 self.stream_file[k] = marshalled[k]22042205 self.stream_have_file_info =True22062207# Stream directly from "p4 files" into "git fast-import"2208defstreamP4Files(self, files):2209 filesForCommit = []2210 filesToRead = []2211 filesToDelete = []22122213for f in files:2214# if using a client spec, only add the files that have2215# a path in the client2216if self.clientSpecDirs:2217if self.clientSpecDirs.map_in_client(f['path']) =="":2218continue22192220 filesForCommit.append(f)2221if f['action']in self.delete_actions:2222 filesToDelete.append(f)2223else:2224 filesToRead.append(f)22252226# deleted files...2227for f in filesToDelete:2228 self.streamOneP4Deletion(f)22292230iflen(filesToRead) >0:2231 self.stream_file = {}2232 self.stream_contents = []2233 self.stream_have_file_info =False22342235# curry self argument2236defstreamP4FilesCbSelf(entry):2237 self.streamP4FilesCb(entry)22382239 fileArgs = ['%s#%s'% (f['path'], f['rev'])for f in filesToRead]22402241p4CmdList(["-x","-","print"],2242 stdin=fileArgs,2243 cb=streamP4FilesCbSelf)22442245# do the last chunk2246if self.stream_file.has_key('depotFile'):2247 self.streamOneP4File(self.stream_file, self.stream_contents)22482249defmake_email(self, userid):2250if userid in self.users:2251return self.users[userid]2252else:2253return"%s<a@b>"% userid22542255# Stream a p4 tag2256defstreamTag(self, gitStream, labelName, labelDetails, commit, epoch):2257if verbose:2258print"writing tag%sfor commit%s"% (labelName, commit)2259 gitStream.write("tag%s\n"% labelName)2260 gitStream.write("from%s\n"% commit)22612262if labelDetails.has_key('Owner'):2263 owner = labelDetails["Owner"]2264else:2265 owner =None22662267# Try to use the owner of the p4 label, or failing that,2268# the current p4 user id.2269if owner:2270 email = self.make_email(owner)2271else:2272 email = self.make_email(self.p4UserId())2273 tagger ="%s %s %s"% (email, epoch, self.tz)22742275 gitStream.write("tagger%s\n"% tagger)22762277print"labelDetails=",labelDetails2278if labelDetails.has_key('Description'):2279 description = labelDetails['Description']2280else:2281 description ='Label from git p4'22822283 gitStream.write("data%d\n"%len(description))2284 gitStream.write(description)2285 gitStream.write("\n")22862287defcommit(self, details, files, branch, parent =""):2288 epoch = details["time"]2289 author = details["user"]22902291if self.verbose:2292print"commit into%s"% branch22932294# start with reading files; if that fails, we should not2295# create a commit.2296 new_files = []2297for f in files:2298if[p for p in self.branchPrefixes ifp4PathStartsWith(f['path'], p)]:2299 new_files.append(f)2300else:2301 sys.stderr.write("Ignoring file outside of prefix:%s\n"% f['path'])23022303 self.gitStream.write("commit%s\n"% branch)2304# gitStream.write("mark :%s\n" % details["change"])2305 self.committedChanges.add(int(details["change"]))2306 committer =""2307if author not in self.users:2308 self.getUserMapFromPerforceServer()2309 committer ="%s %s %s"% (self.make_email(author), epoch, self.tz)23102311 self.gitStream.write("committer%s\n"% committer)23122313 self.gitStream.write("data <<EOT\n")2314 self.gitStream.write(details["desc"])2315 self.gitStream.write("\n[git-p4: depot-paths =\"%s\": change =%s"%2316(','.join(self.branchPrefixes), details["change"]))2317iflen(details['options']) >0:2318 self.gitStream.write(": options =%s"% details['options'])2319 self.gitStream.write("]\nEOT\n\n")23202321iflen(parent) >0:2322if self.verbose:2323print"parent%s"% parent2324 self.gitStream.write("from%s\n"% parent)23252326 self.streamP4Files(new_files)2327 self.gitStream.write("\n")23282329 change =int(details["change"])23302331if self.labels.has_key(change):2332 label = self.labels[change]2333 labelDetails = label[0]2334 labelRevisions = label[1]2335if self.verbose:2336print"Change%sis labelled%s"% (change, labelDetails)23372338 files =p4CmdList(["files"] + ["%s...@%s"% (p, change)2339for p in self.branchPrefixes])23402341iflen(files) ==len(labelRevisions):23422343 cleanedFiles = {}2344for info in files:2345if info["action"]in self.delete_actions:2346continue2347 cleanedFiles[info["depotFile"]] = info["rev"]23482349if cleanedFiles == labelRevisions:2350 self.streamTag(self.gitStream,'tag_%s'% labelDetails['label'], labelDetails, branch, epoch)23512352else:2353if not self.silent:2354print("Tag%sdoes not match with change%s: files do not match."2355% (labelDetails["label"], change))23562357else:2358if not self.silent:2359print("Tag%sdoes not match with change%s: file count is different."2360% (labelDetails["label"], change))23612362# Build a dictionary of changelists and labels, for "detect-labels" option.2363defgetLabels(self):2364 self.labels = {}23652366 l =p4CmdList(["labels"] + ["%s..."% p for p in self.depotPaths])2367iflen(l) >0and not self.silent:2368print"Finding files belonging to labels in%s"% `self.depotPaths`23692370for output in l:2371 label = output["label"]2372 revisions = {}2373 newestChange =02374if self.verbose:2375print"Querying files for label%s"% label2376forfileinp4CmdList(["files"] +2377["%s...@%s"% (p, label)2378for p in self.depotPaths]):2379 revisions[file["depotFile"]] =file["rev"]2380 change =int(file["change"])2381if change > newestChange:2382 newestChange = change23832384 self.labels[newestChange] = [output, revisions]23852386if self.verbose:2387print"Label changes:%s"% self.labels.keys()23882389# Import p4 labels as git tags. A direct mapping does not2390# exist, so assume that if all the files are at the same revision2391# then we can use that, or it's something more complicated we should2392# just ignore.2393defimportP4Labels(self, stream, p4Labels):2394if verbose:2395print"import p4 labels: "+' '.join(p4Labels)23962397 ignoredP4Labels =gitConfigList("git-p4.ignoredP4Labels")2398 validLabelRegexp =gitConfig("git-p4.labelImportRegexp")2399iflen(validLabelRegexp) ==0:2400 validLabelRegexp = defaultLabelRegexp2401 m = re.compile(validLabelRegexp)24022403for name in p4Labels:2404 commitFound =False24052406if not m.match(name):2407if verbose:2408print"label%sdoes not match regexp%s"% (name,validLabelRegexp)2409continue24102411if name in ignoredP4Labels:2412continue24132414 labelDetails =p4CmdList(['label',"-o", name])[0]24152416# get the most recent changelist for each file in this label2417 change =p4Cmd(["changes","-m","1"] + ["%s...@%s"% (p, name)2418for p in self.depotPaths])24192420if change.has_key('change'):2421# find the corresponding git commit; take the oldest commit2422 changelist =int(change['change'])2423 gitCommit =read_pipe(["git","rev-list","--max-count=1",2424"--reverse",":/\[git-p4:.*change =%d\]"% changelist])2425iflen(gitCommit) ==0:2426print"could not find git commit for changelist%d"% changelist2427else:2428 gitCommit = gitCommit.strip()2429 commitFound =True2430# Convert from p4 time format2431try:2432 tmwhen = time.strptime(labelDetails['Update'],"%Y/%m/%d%H:%M:%S")2433exceptValueError:2434print"Could not convert label time%s"% labelDetails['Update']2435 tmwhen =124362437 when =int(time.mktime(tmwhen))2438 self.streamTag(stream, name, labelDetails, gitCommit, when)2439if verbose:2440print"p4 label%smapped to git commit%s"% (name, gitCommit)2441else:2442if verbose:2443print"Label%shas no changelists - possibly deleted?"% name24442445if not commitFound:2446# We can't import this label; don't try again as it will get very2447# expensive repeatedly fetching all the files for labels that will2448# never be imported. If the label is moved in the future, the2449# ignore will need to be removed manually.2450system(["git","config","--add","git-p4.ignoredP4Labels", name])24512452defguessProjectName(self):2453for p in self.depotPaths:2454if p.endswith("/"):2455 p = p[:-1]2456 p = p[p.strip().rfind("/") +1:]2457if not p.endswith("/"):2458 p +="/"2459return p24602461defgetBranchMapping(self):2462 lostAndFoundBranches =set()24632464 user =gitConfig("git-p4.branchUser")2465iflen(user) >0:2466 command ="branches -u%s"% user2467else:2468 command ="branches"24692470for info inp4CmdList(command):2471 details =p4Cmd(["branch","-o", info["branch"]])2472 viewIdx =02473while details.has_key("View%s"% viewIdx):2474 paths = details["View%s"% viewIdx].split(" ")2475 viewIdx = viewIdx +12476# require standard //depot/foo/... //depot/bar/... mapping2477iflen(paths) !=2or not paths[0].endswith("/...")or not paths[1].endswith("/..."):2478continue2479 source = paths[0]2480 destination = paths[1]2481## HACK2482ifp4PathStartsWith(source, self.depotPaths[0])andp4PathStartsWith(destination, self.depotPaths[0]):2483 source = source[len(self.depotPaths[0]):-4]2484 destination = destination[len(self.depotPaths[0]):-4]24852486if destination in self.knownBranches:2487if not self.silent:2488print"p4 branch%sdefines a mapping from%sto%s"% (info["branch"], source, destination)2489print"but there exists another mapping from%sto%salready!"% (self.knownBranches[destination], destination)2490continue24912492 self.knownBranches[destination] = source24932494 lostAndFoundBranches.discard(destination)24952496if source not in self.knownBranches:2497 lostAndFoundBranches.add(source)24982499# Perforce does not strictly require branches to be defined, so we also2500# check git config for a branch list.2501#2502# Example of branch definition in git config file:2503# [git-p4]2504# branchList=main:branchA2505# branchList=main:branchB2506# branchList=branchA:branchC2507 configBranches =gitConfigList("git-p4.branchList")2508for branch in configBranches:2509if branch:2510(source, destination) = branch.split(":")2511 self.knownBranches[destination] = source25122513 lostAndFoundBranches.discard(destination)25142515if source not in self.knownBranches:2516 lostAndFoundBranches.add(source)251725182519for branch in lostAndFoundBranches:2520 self.knownBranches[branch] = branch25212522defgetBranchMappingFromGitBranches(self):2523 branches =p4BranchesInGit(self.importIntoRemotes)2524for branch in branches.keys():2525if branch =="master":2526 branch ="main"2527else:2528 branch = branch[len(self.projectName):]2529 self.knownBranches[branch] = branch25302531defupdateOptionDict(self, d):2532 option_keys = {}2533if self.keepRepoPath:2534 option_keys['keepRepoPath'] =125352536 d["options"] =' '.join(sorted(option_keys.keys()))25372538defreadOptions(self, d):2539 self.keepRepoPath = (d.has_key('options')2540and('keepRepoPath'in d['options']))25412542defgitRefForBranch(self, branch):2543if branch =="main":2544return self.refPrefix +"master"25452546iflen(branch) <=0:2547return branch25482549return self.refPrefix + self.projectName + branch25502551defgitCommitByP4Change(self, ref, change):2552if self.verbose:2553print"looking in ref "+ ref +" for change%susing bisect..."% change25542555 earliestCommit =""2556 latestCommit =parseRevision(ref)25572558while True:2559if self.verbose:2560print"trying: earliest%slatest%s"% (earliestCommit, latestCommit)2561 next =read_pipe("git rev-list --bisect%s %s"% (latestCommit, earliestCommit)).strip()2562iflen(next) ==0:2563if self.verbose:2564print"argh"2565return""2566 log =extractLogMessageFromGitCommit(next)2567 settings =extractSettingsGitLog(log)2568 currentChange =int(settings['change'])2569if self.verbose:2570print"current change%s"% currentChange25712572if currentChange == change:2573if self.verbose:2574print"found%s"% next2575return next25762577if currentChange < change:2578 earliestCommit ="^%s"% next2579else:2580 latestCommit ="%s"% next25812582return""25832584defimportNewBranch(self, branch, maxChange):2585# make fast-import flush all changes to disk and update the refs using the checkpoint2586# command so that we can try to find the branch parent in the git history2587 self.gitStream.write("checkpoint\n\n");2588 self.gitStream.flush();2589 branchPrefix = self.depotPaths[0] + branch +"/"2590range="@1,%s"% maxChange2591#print "prefix" + branchPrefix2592 changes =p4ChangesForPaths([branchPrefix],range)2593iflen(changes) <=0:2594return False2595 firstChange = changes[0]2596#print "first change in branch: %s" % firstChange2597 sourceBranch = self.knownBranches[branch]2598 sourceDepotPath = self.depotPaths[0] + sourceBranch2599 sourceRef = self.gitRefForBranch(sourceBranch)2600#print "source " + sourceBranch26012602 branchParentChange =int(p4Cmd(["changes","-m","1","%s...@1,%s"% (sourceDepotPath, firstChange)])["change"])2603#print "branch parent: %s" % branchParentChange2604 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)2605iflen(gitParent) >0:2606 self.initialParents[self.gitRefForBranch(branch)] = gitParent2607#print "parent git commit: %s" % gitParent26082609 self.importChanges(changes)2610return True26112612defsearchParent(self, parent, branch, target):2613 parentFound =False2614for blob inread_pipe_lines(["git","rev-list","--reverse","--no-merges", parent]):2615 blob = blob.strip()2616iflen(read_pipe(["git","diff-tree", blob, target])) ==0:2617 parentFound =True2618if self.verbose:2619print"Found parent of%sin commit%s"% (branch, blob)2620break2621if parentFound:2622return blob2623else:2624return None26252626defimportChanges(self, changes):2627 cnt =12628for change in changes:2629 description =p4_describe(change)2630 self.updateOptionDict(description)26312632if not self.silent:2633 sys.stdout.write("\rImporting revision%s(%s%%)"% (change, cnt *100/len(changes)))2634 sys.stdout.flush()2635 cnt = cnt +126362637try:2638if self.detectBranches:2639 branches = self.splitFilesIntoBranches(description)2640for branch in branches.keys():2641## HACK --hwn2642 branchPrefix = self.depotPaths[0] + branch +"/"2643 self.branchPrefixes = [ branchPrefix ]26442645 parent =""26462647 filesForCommit = branches[branch]26482649if self.verbose:2650print"branch is%s"% branch26512652 self.updatedBranches.add(branch)26532654if branch not in self.createdBranches:2655 self.createdBranches.add(branch)2656 parent = self.knownBranches[branch]2657if parent == branch:2658 parent =""2659else:2660 fullBranch = self.projectName + branch2661if fullBranch not in self.p4BranchesInGit:2662if not self.silent:2663print("\nImporting new branch%s"% fullBranch);2664if self.importNewBranch(branch, change -1):2665 parent =""2666 self.p4BranchesInGit.append(fullBranch)2667if not self.silent:2668print("\nResuming with change%s"% change);26692670if self.verbose:2671print"parent determined through known branches:%s"% parent26722673 branch = self.gitRefForBranch(branch)2674 parent = self.gitRefForBranch(parent)26752676if self.verbose:2677print"looking for initial parent for%s; current parent is%s"% (branch, parent)26782679iflen(parent) ==0and branch in self.initialParents:2680 parent = self.initialParents[branch]2681del self.initialParents[branch]26822683 blob =None2684iflen(parent) >0:2685 tempBranch ="%s/%d"% (self.tempBranchLocation, change)2686if self.verbose:2687print"Creating temporary branch: "+ tempBranch2688 self.commit(description, filesForCommit, tempBranch)2689 self.tempBranches.append(tempBranch)2690 self.checkpoint()2691 blob = self.searchParent(parent, branch, tempBranch)2692if blob:2693 self.commit(description, filesForCommit, branch, blob)2694else:2695if self.verbose:2696print"Parent of%snot found. Committing into head of%s"% (branch, parent)2697 self.commit(description, filesForCommit, branch, parent)2698else:2699 files = self.extractFilesFromCommit(description)2700 self.commit(description, files, self.branch,2701 self.initialParent)2702# only needed once, to connect to the previous commit2703 self.initialParent =""2704exceptIOError:2705print self.gitError.read()2706 sys.exit(1)27072708defimportHeadRevision(self, revision):2709print"Doing initial import of%sfrom revision%sinto%s"% (' '.join(self.depotPaths), revision, self.branch)27102711 details = {}2712 details["user"] ="git perforce import user"2713 details["desc"] = ("Initial import of%sfrom the state at revision%s\n"2714% (' '.join(self.depotPaths), revision))2715 details["change"] = revision2716 newestRevision =027172718 fileCnt =02719 fileArgs = ["%s...%s"% (p,revision)for p in self.depotPaths]27202721for info inp4CmdList(["files"] + fileArgs):27222723if'code'in info and info['code'] =='error':2724 sys.stderr.write("p4 returned an error:%s\n"2725% info['data'])2726if info['data'].find("must refer to client") >=0:2727 sys.stderr.write("This particular p4 error is misleading.\n")2728 sys.stderr.write("Perhaps the depot path was misspelled.\n");2729 sys.stderr.write("Depot path:%s\n"%" ".join(self.depotPaths))2730 sys.exit(1)2731if'p4ExitCode'in info:2732 sys.stderr.write("p4 exitcode:%s\n"% info['p4ExitCode'])2733 sys.exit(1)273427352736 change =int(info["change"])2737if change > newestRevision:2738 newestRevision = change27392740if info["action"]in self.delete_actions:2741# don't increase the file cnt, otherwise details["depotFile123"] will have gaps!2742#fileCnt = fileCnt + 12743continue27442745for prop in["depotFile","rev","action","type"]:2746 details["%s%s"% (prop, fileCnt)] = info[prop]27472748 fileCnt = fileCnt +127492750 details["change"] = newestRevision27512752# Use time from top-most change so that all git p4 clones of2753# the same p4 repo have the same commit SHA1s.2754 res =p4_describe(newestRevision)2755 details["time"] = res["time"]27562757 self.updateOptionDict(details)2758try:2759 self.commit(details, self.extractFilesFromCommit(details), self.branch)2760exceptIOError:2761print"IO error with git fast-import. Is your git version recent enough?"2762print self.gitError.read()276327642765defrun(self, args):2766 self.depotPaths = []2767 self.changeRange =""2768 self.previousDepotPaths = []2769 self.hasOrigin =False27702771# map from branch depot path to parent branch2772 self.knownBranches = {}2773 self.initialParents = {}27742775if self.importIntoRemotes:2776 self.refPrefix ="refs/remotes/p4/"2777else:2778 self.refPrefix ="refs/heads/p4/"27792780if self.syncWithOrigin:2781 self.hasOrigin =originP4BranchesExist()2782if self.hasOrigin:2783if not self.silent:2784print'Syncing with origin first, using "git fetch origin"'2785system("git fetch origin")27862787 branch_arg_given =bool(self.branch)2788iflen(self.branch) ==0:2789 self.branch = self.refPrefix +"master"2790ifgitBranchExists("refs/heads/p4")and self.importIntoRemotes:2791system("git update-ref%srefs/heads/p4"% self.branch)2792system("git branch -D p4")27932794# accept either the command-line option, or the configuration variable2795if self.useClientSpec:2796# will use this after clone to set the variable2797 self.useClientSpec_from_options =True2798else:2799ifgitConfig("git-p4.useclientspec","--bool") =="true":2800 self.useClientSpec =True2801if self.useClientSpec:2802 self.clientSpecDirs =getClientSpec()28032804# TODO: should always look at previous commits,2805# merge with previous imports, if possible.2806if args == []:2807if self.hasOrigin:2808createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)28092810# branches holds mapping from branch name to sha12811 branches =p4BranchesInGit(self.importIntoRemotes)28122813# restrict to just this one, disabling detect-branches2814if branch_arg_given:2815 short = self.branch.split("/")[-1]2816if short in branches:2817 self.p4BranchesInGit = [ short ]2818else:2819 self.p4BranchesInGit = branches.keys()28202821iflen(self.p4BranchesInGit) >1:2822if not self.silent:2823print"Importing from/into multiple branches"2824 self.detectBranches =True2825for branch in branches.keys():2826 self.initialParents[self.refPrefix + branch] = \2827 branches[branch]28282829if self.verbose:2830print"branches:%s"% self.p4BranchesInGit28312832 p4Change =02833for branch in self.p4BranchesInGit:2834 logMsg =extractLogMessageFromGitCommit(self.refPrefix + branch)28352836 settings =extractSettingsGitLog(logMsg)28372838 self.readOptions(settings)2839if(settings.has_key('depot-paths')2840and settings.has_key('change')):2841 change =int(settings['change']) +12842 p4Change =max(p4Change, change)28432844 depotPaths =sorted(settings['depot-paths'])2845if self.previousDepotPaths == []:2846 self.previousDepotPaths = depotPaths2847else:2848 paths = []2849for(prev, cur)inzip(self.previousDepotPaths, depotPaths):2850 prev_list = prev.split("/")2851 cur_list = cur.split("/")2852for i inrange(0,min(len(cur_list),len(prev_list))):2853if cur_list[i] <> prev_list[i]:2854 i = i -12855break28562857 paths.append("/".join(cur_list[:i +1]))28582859 self.previousDepotPaths = paths28602861if p4Change >0:2862 self.depotPaths =sorted(self.previousDepotPaths)2863 self.changeRange ="@%s,#head"% p4Change2864if not self.silent and not self.detectBranches:2865print"Performing incremental import into%sgit branch"% self.branch28662867# accept multiple ref name abbreviations:2868# refs/foo/bar/branch -> use it exactly2869# p4/branch -> prepend refs/remotes/ or refs/heads/2870# branch -> prepend refs/remotes/p4/ or refs/heads/p4/2871if not self.branch.startswith("refs/"):2872if self.importIntoRemotes:2873 prepend ="refs/remotes/"2874else:2875 prepend ="refs/heads/"2876if not self.branch.startswith("p4/"):2877 prepend +="p4/"2878 self.branch = prepend + self.branch28792880iflen(args) ==0and self.depotPaths:2881if not self.silent:2882print"Depot paths:%s"%' '.join(self.depotPaths)2883else:2884if self.depotPaths and self.depotPaths != args:2885print("previous import used depot path%sand now%swas specified. "2886"This doesn't work!"% (' '.join(self.depotPaths),2887' '.join(args)))2888 sys.exit(1)28892890 self.depotPaths =sorted(args)28912892 revision =""2893 self.users = {}28942895# Make sure no revision specifiers are used when --changesfile2896# is specified.2897 bad_changesfile =False2898iflen(self.changesFile) >0:2899for p in self.depotPaths:2900if p.find("@") >=0or p.find("#") >=0:2901 bad_changesfile =True2902break2903if bad_changesfile:2904die("Option --changesfile is incompatible with revision specifiers")29052906 newPaths = []2907for p in self.depotPaths:2908if p.find("@") != -1:2909 atIdx = p.index("@")2910 self.changeRange = p[atIdx:]2911if self.changeRange =="@all":2912 self.changeRange =""2913elif','not in self.changeRange:2914 revision = self.changeRange2915 self.changeRange =""2916 p = p[:atIdx]2917elif p.find("#") != -1:2918 hashIdx = p.index("#")2919 revision = p[hashIdx:]2920 p = p[:hashIdx]2921elif self.previousDepotPaths == []:2922# pay attention to changesfile, if given, else import2923# the entire p4 tree at the head revision2924iflen(self.changesFile) ==0:2925 revision ="#head"29262927 p = re.sub("\.\.\.$","", p)2928if not p.endswith("/"):2929 p +="/"29302931 newPaths.append(p)29322933 self.depotPaths = newPaths29342935# --detect-branches may change this for each branch2936 self.branchPrefixes = self.depotPaths29372938 self.loadUserMapFromCache()2939 self.labels = {}2940if self.detectLabels:2941 self.getLabels();29422943if self.detectBranches:2944## FIXME - what's a P4 projectName ?2945 self.projectName = self.guessProjectName()29462947if self.hasOrigin:2948 self.getBranchMappingFromGitBranches()2949else:2950 self.getBranchMapping()2951if self.verbose:2952print"p4-git branches:%s"% self.p4BranchesInGit2953print"initial parents:%s"% self.initialParents2954for b in self.p4BranchesInGit:2955if b !="master":29562957## FIXME2958 b = b[len(self.projectName):]2959 self.createdBranches.add(b)29602961 self.tz ="%+03d%02d"% (- time.timezone /3600, ((- time.timezone %3600) /60))29622963 self.importProcess = subprocess.Popen(["git","fast-import"],2964 stdin=subprocess.PIPE,2965 stdout=subprocess.PIPE,2966 stderr=subprocess.PIPE);2967 self.gitOutput = self.importProcess.stdout2968 self.gitStream = self.importProcess.stdin2969 self.gitError = self.importProcess.stderr29702971if revision:2972 self.importHeadRevision(revision)2973else:2974 changes = []29752976iflen(self.changesFile) >0:2977 output =open(self.changesFile).readlines()2978 changeSet =set()2979for line in output:2980 changeSet.add(int(line))29812982for change in changeSet:2983 changes.append(change)29842985 changes.sort()2986else:2987# catch "git p4 sync" with no new branches, in a repo that2988# does not have any existing p4 branches2989iflen(args) ==0:2990if not self.p4BranchesInGit:2991die("No remote p4 branches. Perhaps you never did\"git p4 clone\"in here.")29922993# The default branch is master, unless --branch is used to2994# specify something else. Make sure it exists, or complain2995# nicely about how to use --branch.2996if not self.detectBranches:2997if notbranch_exists(self.branch):2998if branch_arg_given:2999die("Error: branch%sdoes not exist."% self.branch)3000else:3001die("Error: no branch%s; perhaps specify one with --branch."%3002 self.branch)30033004if self.verbose:3005print"Getting p4 changes for%s...%s"% (', '.join(self.depotPaths),3006 self.changeRange)3007 changes =p4ChangesForPaths(self.depotPaths, self.changeRange)30083009iflen(self.maxChanges) >0:3010 changes = changes[:min(int(self.maxChanges),len(changes))]30113012iflen(changes) ==0:3013if not self.silent:3014print"No changes to import!"3015else:3016if not self.silent and not self.detectBranches:3017print"Import destination:%s"% self.branch30183019 self.updatedBranches =set()30203021if not self.detectBranches:3022if args:3023# start a new branch3024 self.initialParent =""3025else:3026# build on a previous revision3027 self.initialParent =parseRevision(self.branch)30283029 self.importChanges(changes)30303031if not self.silent:3032print""3033iflen(self.updatedBranches) >0:3034 sys.stdout.write("Updated branches: ")3035for b in self.updatedBranches:3036 sys.stdout.write("%s"% b)3037 sys.stdout.write("\n")30383039ifgitConfig("git-p4.importLabels","--bool") =="true":3040 self.importLabels =True30413042if self.importLabels:3043 p4Labels =getP4Labels(self.depotPaths)3044 gitTags =getGitTags()30453046 missingP4Labels = p4Labels - gitTags3047 self.importP4Labels(self.gitStream, missingP4Labels)30483049 self.gitStream.close()3050if self.importProcess.wait() !=0:3051die("fast-import failed:%s"% self.gitError.read())3052 self.gitOutput.close()3053 self.gitError.close()30543055# Cleanup temporary branches created during import3056if self.tempBranches != []:3057for branch in self.tempBranches:3058read_pipe("git update-ref -d%s"% branch)3059 os.rmdir(os.path.join(os.environ.get("GIT_DIR",".git"), self.tempBranchLocation))30603061# Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow3062# a convenient shortcut refname "p4".3063if self.importIntoRemotes:3064 head_ref = self.refPrefix +"HEAD"3065if notgitBranchExists(head_ref)andgitBranchExists(self.branch):3066system(["git","symbolic-ref", head_ref, self.branch])30673068return True30693070classP4Rebase(Command):3071def__init__(self):3072 Command.__init__(self)3073 self.options = [3074 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),3075]3076 self.importLabels =False3077 self.description = ("Fetches the latest revision from perforce and "3078+"rebases the current work (branch) against it")30793080defrun(self, args):3081 sync =P4Sync()3082 sync.importLabels = self.importLabels3083 sync.run([])30843085return self.rebase()30863087defrebase(self):3088if os.system("git update-index --refresh") !=0:3089die("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.");3090iflen(read_pipe("git diff-index HEAD --")) >0:3091die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash.");30923093[upstream, settings] =findUpstreamBranchPoint()3094iflen(upstream) ==0:3095die("Cannot find upstream branchpoint for rebase")30963097# the branchpoint may be p4/foo~3, so strip off the parent3098 upstream = re.sub("~[0-9]+$","", upstream)30993100print"Rebasing the current branch onto%s"% upstream3101 oldHead =read_pipe("git rev-parse HEAD").strip()3102system("git rebase%s"% upstream)3103system("git diff-tree --stat --summary -M%sHEAD"% oldHead)3104return True31053106classP4Clone(P4Sync):3107def__init__(self):3108 P4Sync.__init__(self)3109 self.description ="Creates a new git repository and imports from Perforce into it"3110 self.usage ="usage: %prog [options] //depot/path[@revRange]"3111 self.options += [3112 optparse.make_option("--destination", dest="cloneDestination",3113 action='store', default=None,3114help="where to leave result of the clone"),3115 optparse.make_option("-/", dest="cloneExclude",3116 action="append",type="string",3117help="exclude depot path"),3118 optparse.make_option("--bare", dest="cloneBare",3119 action="store_true", default=False),3120]3121 self.cloneDestination =None3122 self.needsGit =False3123 self.cloneBare =False31243125# This is required for the "append" cloneExclude action3126defensure_value(self, attr, value):3127if nothasattr(self, attr)orgetattr(self, attr)is None:3128setattr(self, attr, value)3129returngetattr(self, attr)31303131defdefaultDestination(self, args):3132## TODO: use common prefix of args?3133 depotPath = args[0]3134 depotDir = re.sub("(@[^@]*)$","", depotPath)3135 depotDir = re.sub("(#[^#]*)$","", depotDir)3136 depotDir = re.sub(r"\.\.\.$","", depotDir)3137 depotDir = re.sub(r"/$","", depotDir)3138return os.path.split(depotDir)[1]31393140defrun(self, args):3141iflen(args) <1:3142return False31433144if self.keepRepoPath and not self.cloneDestination:3145 sys.stderr.write("Must specify destination for --keep-path\n")3146 sys.exit(1)31473148 depotPaths = args31493150if not self.cloneDestination andlen(depotPaths) >1:3151 self.cloneDestination = depotPaths[-1]3152 depotPaths = depotPaths[:-1]31533154 self.cloneExclude = ["/"+p for p in self.cloneExclude]3155for p in depotPaths:3156if not p.startswith("//"):3157 sys.stderr.write('Depot paths must start with "//":%s\n'% p)3158return False31593160if not self.cloneDestination:3161 self.cloneDestination = self.defaultDestination(args)31623163print"Importing from%sinto%s"% (', '.join(depotPaths), self.cloneDestination)31643165if not os.path.exists(self.cloneDestination):3166 os.makedirs(self.cloneDestination)3167chdir(self.cloneDestination)31683169 init_cmd = ["git","init"]3170if self.cloneBare:3171 init_cmd.append("--bare")3172 subprocess.check_call(init_cmd)31733174if not P4Sync.run(self, depotPaths):3175return False31763177# create a master branch and check out a work tree3178ifgitBranchExists(self.branch):3179system(["git","branch","master", self.branch ])3180if not self.cloneBare:3181system(["git","checkout","-f"])3182else:3183print'Not checking out any branch, use ' \3184'"git checkout -q -b master <branch>"'31853186# auto-set this variable if invoked with --use-client-spec3187if self.useClientSpec_from_options:3188system("git config --bool git-p4.useclientspec true")31893190return True31913192classP4Branches(Command):3193def__init__(self):3194 Command.__init__(self)3195 self.options = [ ]3196 self.description = ("Shows the git branches that hold imports and their "3197+"corresponding perforce depot paths")3198 self.verbose =False31993200defrun(self, args):3201iforiginP4BranchesExist():3202createOrUpdateBranchesFromOrigin()32033204 cmdline ="git rev-parse --symbolic "3205 cmdline +=" --remotes"32063207for line inread_pipe_lines(cmdline):3208 line = line.strip()32093210if not line.startswith('p4/')or line =="p4/HEAD":3211continue3212 branch = line32133214 log =extractLogMessageFromGitCommit("refs/remotes/%s"% branch)3215 settings =extractSettingsGitLog(log)32163217print"%s<=%s(%s)"% (branch,",".join(settings["depot-paths"]), settings["change"])3218return True32193220classHelpFormatter(optparse.IndentedHelpFormatter):3221def__init__(self):3222 optparse.IndentedHelpFormatter.__init__(self)32233224defformat_description(self, description):3225if description:3226return description +"\n"3227else:3228return""32293230defprintUsage(commands):3231print"usage:%s<command> [options]"% sys.argv[0]3232print""3233print"valid commands:%s"%", ".join(commands)3234print""3235print"Try%s<command> --help for command specific help."% sys.argv[0]3236print""32373238commands = {3239"debug": P4Debug,3240"submit": P4Submit,3241"commit": P4Submit,3242"sync": P4Sync,3243"rebase": P4Rebase,3244"clone": P4Clone,3245"rollback": P4RollBack,3246"branches": P4Branches3247}324832493250defmain():3251iflen(sys.argv[1:]) ==0:3252printUsage(commands.keys())3253 sys.exit(2)32543255 cmdName = sys.argv[1]3256try:3257 klass = commands[cmdName]3258 cmd =klass()3259exceptKeyError:3260print"unknown command%s"% cmdName3261print""3262printUsage(commands.keys())3263 sys.exit(2)32643265 options = cmd.options3266 cmd.gitdir = os.environ.get("GIT_DIR",None)32673268 args = sys.argv[2:]32693270 options.append(optparse.make_option("--verbose","-v", dest="verbose", action="store_true"))3271if cmd.needsGit:3272 options.append(optparse.make_option("--git-dir", dest="gitdir"))32733274 parser = optparse.OptionParser(cmd.usage.replace("%prog","%prog "+ cmdName),3275 options,3276 description = cmd.description,3277 formatter =HelpFormatter())32783279(cmd, args) = parser.parse_args(sys.argv[2:], cmd);3280global verbose3281 verbose = cmd.verbose3282if cmd.needsGit:3283if cmd.gitdir ==None:3284 cmd.gitdir = os.path.abspath(".git")3285if notisValidGitDir(cmd.gitdir):3286 cmd.gitdir =read_pipe("git rev-parse --git-dir").strip()3287if os.path.exists(cmd.gitdir):3288 cdup =read_pipe("git rev-parse --show-cdup").strip()3289iflen(cdup) >0:3290chdir(cdup);32913292if notisValidGitDir(cmd.gitdir):3293ifisValidGitDir(cmd.gitdir +"/.git"):3294 cmd.gitdir +="/.git"3295else:3296die("fatal: cannot locate git repository at%s"% cmd.gitdir)32973298 os.environ["GIT_DIR"] = cmd.gitdir32993300if not cmd.run(args):3301 parser.print_help()3302 sys.exit(2)330333043305if __name__ =='__main__':3306main()