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 24import stat 25import zipfile 26import zlib 27import ctypes 28import errno 29 30try: 31from subprocess import CalledProcessError 32exceptImportError: 33# from python2.7:subprocess.py 34# Exception classes used by this module. 35classCalledProcessError(Exception): 36"""This exception is raised when a process run by check_call() returns 37 a non-zero exit status. The exit status will be stored in the 38 returncode attribute.""" 39def__init__(self, returncode, cmd): 40 self.returncode = returncode 41 self.cmd = cmd 42def__str__(self): 43return"Command '%s' returned non-zero exit status%d"% (self.cmd, self.returncode) 44 45verbose =False 46 47# Only labels/tags matching this will be imported/exported 48defaultLabelRegexp = r'[a-zA-Z0-9_\-.]+$' 49 50# Grab changes in blocks of this many revisions, unless otherwise requested 51defaultBlockSize =512 52 53defp4_build_cmd(cmd): 54"""Build a suitable p4 command line. 55 56 This consolidates building and returning a p4 command line into one 57 location. It means that hooking into the environment, or other configuration 58 can be done more easily. 59 """ 60 real_cmd = ["p4"] 61 62 user =gitConfig("git-p4.user") 63iflen(user) >0: 64 real_cmd += ["-u",user] 65 66 password =gitConfig("git-p4.password") 67iflen(password) >0: 68 real_cmd += ["-P", password] 69 70 port =gitConfig("git-p4.port") 71iflen(port) >0: 72 real_cmd += ["-p", port] 73 74 host =gitConfig("git-p4.host") 75iflen(host) >0: 76 real_cmd += ["-H", host] 77 78 client =gitConfig("git-p4.client") 79iflen(client) >0: 80 real_cmd += ["-c", client] 81 82 retries =gitConfigInt("git-p4.retries") 83if retries is None: 84# Perform 3 retries by default 85 retries =3 86if retries >0: 87# Provide a way to not pass this option by setting git-p4.retries to 0 88 real_cmd += ["-r",str(retries)] 89 90ifisinstance(cmd,basestring): 91 real_cmd =' '.join(real_cmd) +' '+ cmd 92else: 93 real_cmd += cmd 94return real_cmd 95 96defgit_dir(path): 97""" Return TRUE if the given path is a git directory (/path/to/dir/.git). 98 This won't automatically add ".git" to a directory. 99 """ 100 d =read_pipe(["git","--git-dir", path,"rev-parse","--git-dir"],True).strip() 101if not d orlen(d) ==0: 102return None 103else: 104return d 105 106defchdir(path, is_client_path=False): 107"""Do chdir to the given path, and set the PWD environment 108 variable for use by P4. It does not look at getcwd() output. 109 Since we're not using the shell, it is necessary to set the 110 PWD environment variable explicitly. 111 112 Normally, expand the path to force it to be absolute. This 113 addresses the use of relative path names inside P4 settings, 114 e.g. P4CONFIG=.p4config. P4 does not simply open the filename 115 as given; it looks for .p4config using PWD. 116 117 If is_client_path, the path was handed to us directly by p4, 118 and may be a symbolic link. Do not call os.getcwd() in this 119 case, because it will cause p4 to think that PWD is not inside 120 the client path. 121 """ 122 123 os.chdir(path) 124if not is_client_path: 125 path = os.getcwd() 126 os.environ['PWD'] = path 127 128defcalcDiskFree(): 129"""Return free space in bytes on the disk of the given dirname.""" 130if platform.system() =='Windows': 131 free_bytes = ctypes.c_ulonglong(0) 132 ctypes.windll.kernel32.GetDiskFreeSpaceExW(ctypes.c_wchar_p(os.getcwd()),None,None, ctypes.pointer(free_bytes)) 133return free_bytes.value 134else: 135 st = os.statvfs(os.getcwd()) 136return st.f_bavail * st.f_frsize 137 138defdie(msg): 139if verbose: 140raiseException(msg) 141else: 142 sys.stderr.write(msg +"\n") 143 sys.exit(1) 144 145defwrite_pipe(c, stdin): 146if verbose: 147 sys.stderr.write('Writing pipe:%s\n'%str(c)) 148 149 expand =isinstance(c,basestring) 150 p = subprocess.Popen(c, stdin=subprocess.PIPE, shell=expand) 151 pipe = p.stdin 152 val = pipe.write(stdin) 153 pipe.close() 154if p.wait(): 155die('Command failed:%s'%str(c)) 156 157return val 158 159defp4_write_pipe(c, stdin): 160 real_cmd =p4_build_cmd(c) 161returnwrite_pipe(real_cmd, stdin) 162 163defread_pipe_full(c): 164""" Read output from command. Returns a tuple 165 of the return status, stdout text and stderr 166 text. 167 """ 168if verbose: 169 sys.stderr.write('Reading pipe:%s\n'%str(c)) 170 171 expand =isinstance(c,basestring) 172 p = subprocess.Popen(c, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=expand) 173(out, err) = p.communicate() 174return(p.returncode, out, err) 175 176defread_pipe(c, ignore_error=False): 177""" Read output from command. Returns the output text on 178 success. On failure, terminates execution, unless 179 ignore_error is True, when it returns an empty string. 180 """ 181(retcode, out, err) =read_pipe_full(c) 182if retcode !=0: 183if ignore_error: 184 out ="" 185else: 186die('Command failed:%s\nError:%s'% (str(c), err)) 187return out 188 189defread_pipe_text(c): 190""" Read output from a command with trailing whitespace stripped. 191 On error, returns None. 192 """ 193(retcode, out, err) =read_pipe_full(c) 194if retcode !=0: 195return None 196else: 197return out.rstrip() 198 199defp4_read_pipe(c, ignore_error=False): 200 real_cmd =p4_build_cmd(c) 201returnread_pipe(real_cmd, ignore_error) 202 203defread_pipe_lines(c): 204if verbose: 205 sys.stderr.write('Reading pipe:%s\n'%str(c)) 206 207 expand =isinstance(c, basestring) 208 p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand) 209 pipe = p.stdout 210 val = pipe.readlines() 211if pipe.close()or p.wait(): 212die('Command failed:%s'%str(c)) 213 214return val 215 216defp4_read_pipe_lines(c): 217"""Specifically invoke p4 on the command supplied. """ 218 real_cmd =p4_build_cmd(c) 219returnread_pipe_lines(real_cmd) 220 221defp4_has_command(cmd): 222"""Ask p4 for help on this command. If it returns an error, the 223 command does not exist in this version of p4.""" 224 real_cmd =p4_build_cmd(["help", cmd]) 225 p = subprocess.Popen(real_cmd, stdout=subprocess.PIPE, 226 stderr=subprocess.PIPE) 227 p.communicate() 228return p.returncode ==0 229 230defp4_has_move_command(): 231"""See if the move command exists, that it supports -k, and that 232 it has not been administratively disabled. The arguments 233 must be correct, but the filenames do not have to exist. Use 234 ones with wildcards so even if they exist, it will fail.""" 235 236if notp4_has_command("move"): 237return False 238 cmd =p4_build_cmd(["move","-k","@from","@to"]) 239 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 240(out, err) = p.communicate() 241# return code will be 1 in either case 242if err.find("Invalid option") >=0: 243return False 244if err.find("disabled") >=0: 245return False 246# assume it failed because @... was invalid changelist 247return True 248 249defsystem(cmd, ignore_error=False): 250 expand =isinstance(cmd,basestring) 251if verbose: 252 sys.stderr.write("executing%s\n"%str(cmd)) 253 retcode = subprocess.call(cmd, shell=expand) 254if retcode and not ignore_error: 255raiseCalledProcessError(retcode, cmd) 256 257return retcode 258 259defp4_system(cmd): 260"""Specifically invoke p4 as the system command. """ 261 real_cmd =p4_build_cmd(cmd) 262 expand =isinstance(real_cmd, basestring) 263 retcode = subprocess.call(real_cmd, shell=expand) 264if retcode: 265raiseCalledProcessError(retcode, real_cmd) 266 267_p4_version_string =None 268defp4_version_string(): 269"""Read the version string, showing just the last line, which 270 hopefully is the interesting version bit. 271 272 $ p4 -V 273 Perforce - The Fast Software Configuration Management System. 274 Copyright 1995-2011 Perforce Software. All rights reserved. 275 Rev. P4/NTX86/2011.1/393975 (2011/12/16). 276 """ 277global _p4_version_string 278if not _p4_version_string: 279 a =p4_read_pipe_lines(["-V"]) 280 _p4_version_string = a[-1].rstrip() 281return _p4_version_string 282 283defp4_integrate(src, dest): 284p4_system(["integrate","-Dt",wildcard_encode(src),wildcard_encode(dest)]) 285 286defp4_sync(f, *options): 287p4_system(["sync"] +list(options) + [wildcard_encode(f)]) 288 289defp4_add(f): 290# forcibly add file names with wildcards 291ifwildcard_present(f): 292p4_system(["add","-f", f]) 293else: 294p4_system(["add", f]) 295 296defp4_delete(f): 297p4_system(["delete",wildcard_encode(f)]) 298 299defp4_edit(f, *options): 300p4_system(["edit"] +list(options) + [wildcard_encode(f)]) 301 302defp4_revert(f): 303p4_system(["revert",wildcard_encode(f)]) 304 305defp4_reopen(type, f): 306p4_system(["reopen","-t",type,wildcard_encode(f)]) 307 308defp4_reopen_in_change(changelist, files): 309 cmd = ["reopen","-c",str(changelist)] + files 310p4_system(cmd) 311 312defp4_move(src, dest): 313p4_system(["move","-k",wildcard_encode(src),wildcard_encode(dest)]) 314 315defp4_last_change(): 316 results =p4CmdList(["changes","-m","1"], skip_info=True) 317returnint(results[0]['change']) 318 319defp4_describe(change): 320"""Make sure it returns a valid result by checking for 321 the presence of field "time". Return a dict of the 322 results.""" 323 324 ds =p4CmdList(["describe","-s",str(change)], skip_info=True) 325iflen(ds) !=1: 326die("p4 describe -s%ddid not return 1 result:%s"% (change,str(ds))) 327 328 d = ds[0] 329 330if"p4ExitCode"in d: 331die("p4 describe -s%dexited with%d:%s"% (change, d["p4ExitCode"], 332str(d))) 333if"code"in d: 334if d["code"] =="error": 335die("p4 describe -s%dreturned error code:%s"% (change,str(d))) 336 337if"time"not in d: 338die("p4 describe -s%dreturned no\"time\":%s"% (change,str(d))) 339 340return d 341 342# 343# Canonicalize the p4 type and return a tuple of the 344# base type, plus any modifiers. See "p4 help filetypes" 345# for a list and explanation. 346# 347defsplit_p4_type(p4type): 348 349 p4_filetypes_historical = { 350"ctempobj":"binary+Sw", 351"ctext":"text+C", 352"cxtext":"text+Cx", 353"ktext":"text+k", 354"kxtext":"text+kx", 355"ltext":"text+F", 356"tempobj":"binary+FSw", 357"ubinary":"binary+F", 358"uresource":"resource+F", 359"uxbinary":"binary+Fx", 360"xbinary":"binary+x", 361"xltext":"text+Fx", 362"xtempobj":"binary+Swx", 363"xtext":"text+x", 364"xunicode":"unicode+x", 365"xutf16":"utf16+x", 366} 367if p4type in p4_filetypes_historical: 368 p4type = p4_filetypes_historical[p4type] 369 mods ="" 370 s = p4type.split("+") 371 base = s[0] 372 mods ="" 373iflen(s) >1: 374 mods = s[1] 375return(base, mods) 376 377# 378# return the raw p4 type of a file (text, text+ko, etc) 379# 380defp4_type(f): 381 results =p4CmdList(["fstat","-T","headType",wildcard_encode(f)]) 382return results[0]['headType'] 383 384# 385# Given a type base and modifier, return a regexp matching 386# the keywords that can be expanded in the file 387# 388defp4_keywords_regexp_for_type(base, type_mods): 389if base in("text","unicode","binary"): 390 kwords =None 391if"ko"in type_mods: 392 kwords ='Id|Header' 393elif"k"in type_mods: 394 kwords ='Id|Header|Author|Date|DateTime|Change|File|Revision' 395else: 396return None 397 pattern = r""" 398 \$ # Starts with a dollar, followed by... 399 (%s) # one of the keywords, followed by... 400 (:[^$\n]+)? # possibly an old expansion, followed by... 401 \$ # another dollar 402 """% kwords 403return pattern 404else: 405return None 406 407# 408# Given a file, return a regexp matching the possible 409# RCS keywords that will be expanded, or None for files 410# with kw expansion turned off. 411# 412defp4_keywords_regexp_for_file(file): 413if not os.path.exists(file): 414return None 415else: 416(type_base, type_mods) =split_p4_type(p4_type(file)) 417returnp4_keywords_regexp_for_type(type_base, type_mods) 418 419defsetP4ExecBit(file, mode): 420# Reopens an already open file and changes the execute bit to match 421# the execute bit setting in the passed in mode. 422 423 p4Type ="+x" 424 425if notisModeExec(mode): 426 p4Type =getP4OpenedType(file) 427 p4Type = re.sub('^([cku]?)x(.*)','\\1\\2', p4Type) 428 p4Type = re.sub('(.*?\+.*?)x(.*?)','\\1\\2', p4Type) 429if p4Type[-1] =="+": 430 p4Type = p4Type[0:-1] 431 432p4_reopen(p4Type,file) 433 434defgetP4OpenedType(file): 435# Returns the perforce file type for the given file. 436 437 result =p4_read_pipe(["opened",wildcard_encode(file)]) 438 match = re.match(".*\((.+)\)( \*exclusive\*)?\r?$", result) 439if match: 440return match.group(1) 441else: 442die("Could not determine file type for%s(result: '%s')"% (file, result)) 443 444# Return the set of all p4 labels 445defgetP4Labels(depotPaths): 446 labels =set() 447ifisinstance(depotPaths,basestring): 448 depotPaths = [depotPaths] 449 450for l inp4CmdList(["labels"] + ["%s..."% p for p in depotPaths]): 451 label = l['label'] 452 labels.add(label) 453 454return labels 455 456# Return the set of all git tags 457defgetGitTags(): 458 gitTags =set() 459for line inread_pipe_lines(["git","tag"]): 460 tag = line.strip() 461 gitTags.add(tag) 462return gitTags 463 464defdiffTreePattern(): 465# This is a simple generator for the diff tree regex pattern. This could be 466# a class variable if this and parseDiffTreeEntry were a part of a class. 467 pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)') 468while True: 469yield pattern 470 471defparseDiffTreeEntry(entry): 472"""Parses a single diff tree entry into its component elements. 473 474 See git-diff-tree(1) manpage for details about the format of the diff 475 output. This method returns a dictionary with the following elements: 476 477 src_mode - The mode of the source file 478 dst_mode - The mode of the destination file 479 src_sha1 - The sha1 for the source file 480 dst_sha1 - The sha1 fr the destination file 481 status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc) 482 status_score - The score for the status (applicable for 'C' and 'R' 483 statuses). This is None if there is no score. 484 src - The path for the source file. 485 dst - The path for the destination file. This is only present for 486 copy or renames. If it is not present, this is None. 487 488 If the pattern is not matched, None is returned.""" 489 490 match =diffTreePattern().next().match(entry) 491if match: 492return{ 493'src_mode': match.group(1), 494'dst_mode': match.group(2), 495'src_sha1': match.group(3), 496'dst_sha1': match.group(4), 497'status': match.group(5), 498'status_score': match.group(6), 499'src': match.group(7), 500'dst': match.group(10) 501} 502return None 503 504defisModeExec(mode): 505# Returns True if the given git mode represents an executable file, 506# otherwise False. 507return mode[-3:] =="755" 508 509defisModeExecChanged(src_mode, dst_mode): 510returnisModeExec(src_mode) !=isModeExec(dst_mode) 511 512defp4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False): 513 514ifisinstance(cmd,basestring): 515 cmd ="-G "+ cmd 516 expand =True 517else: 518 cmd = ["-G"] + cmd 519 expand =False 520 521 cmd =p4_build_cmd(cmd) 522if verbose: 523 sys.stderr.write("Opening pipe:%s\n"%str(cmd)) 524 525# Use a temporary file to avoid deadlocks without 526# subprocess.communicate(), which would put another copy 527# of stdout into memory. 528 stdin_file =None 529if stdin is not None: 530 stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode) 531ifisinstance(stdin,basestring): 532 stdin_file.write(stdin) 533else: 534for i in stdin: 535 stdin_file.write(i +'\n') 536 stdin_file.flush() 537 stdin_file.seek(0) 538 539 p4 = subprocess.Popen(cmd, 540 shell=expand, 541 stdin=stdin_file, 542 stdout=subprocess.PIPE) 543 544 result = [] 545try: 546while True: 547 entry = marshal.load(p4.stdout) 548if skip_info: 549if'code'in entry and entry['code'] =='info': 550continue 551if cb is not None: 552cb(entry) 553else: 554 result.append(entry) 555exceptEOFError: 556pass 557 exitCode = p4.wait() 558if exitCode !=0: 559 entry = {} 560 entry["p4ExitCode"] = exitCode 561 result.append(entry) 562 563return result 564 565defp4Cmd(cmd): 566list=p4CmdList(cmd) 567 result = {} 568for entry inlist: 569 result.update(entry) 570return result; 571 572defp4Where(depotPath): 573if not depotPath.endswith("/"): 574 depotPath +="/" 575 depotPathLong = depotPath +"..." 576 outputList =p4CmdList(["where", depotPathLong]) 577 output =None 578for entry in outputList: 579if"depotFile"in entry: 580# Search for the base client side depot path, as long as it starts with the branch's P4 path. 581# The base path always ends with "/...". 582if entry["depotFile"].find(depotPath) ==0and entry["depotFile"][-4:] =="/...": 583 output = entry 584break 585elif"data"in entry: 586 data = entry.get("data") 587 space = data.find(" ") 588if data[:space] == depotPath: 589 output = entry 590break 591if output ==None: 592return"" 593if output["code"] =="error": 594return"" 595 clientPath ="" 596if"path"in output: 597 clientPath = output.get("path") 598elif"data"in output: 599 data = output.get("data") 600 lastSpace = data.rfind(" ") 601 clientPath = data[lastSpace +1:] 602 603if clientPath.endswith("..."): 604 clientPath = clientPath[:-3] 605return clientPath 606 607defcurrentGitBranch(): 608returnread_pipe_text(["git","symbolic-ref","--short","-q","HEAD"]) 609 610defisValidGitDir(path): 611returngit_dir(path) !=None 612 613defparseRevision(ref): 614returnread_pipe("git rev-parse%s"% ref).strip() 615 616defbranchExists(ref): 617 rev =read_pipe(["git","rev-parse","-q","--verify", ref], 618 ignore_error=True) 619returnlen(rev) >0 620 621defextractLogMessageFromGitCommit(commit): 622 logMessage ="" 623 624## fixme: title is first line of commit, not 1st paragraph. 625 foundTitle =False 626for log inread_pipe_lines("git cat-file commit%s"% commit): 627if not foundTitle: 628iflen(log) ==1: 629 foundTitle =True 630continue 631 632 logMessage += log 633return logMessage 634 635defextractSettingsGitLog(log): 636 values = {} 637for line in log.split("\n"): 638 line = line.strip() 639 m = re.search(r"^ *\[git-p4: (.*)\]$", line) 640if not m: 641continue 642 643 assignments = m.group(1).split(':') 644for a in assignments: 645 vals = a.split('=') 646 key = vals[0].strip() 647 val = ('='.join(vals[1:])).strip() 648if val.endswith('\"')and val.startswith('"'): 649 val = val[1:-1] 650 651 values[key] = val 652 653 paths = values.get("depot-paths") 654if not paths: 655 paths = values.get("depot-path") 656if paths: 657 values['depot-paths'] = paths.split(',') 658return values 659 660defgitBranchExists(branch): 661 proc = subprocess.Popen(["git","rev-parse", branch], 662 stderr=subprocess.PIPE, stdout=subprocess.PIPE); 663return proc.wait() ==0; 664 665_gitConfig = {} 666 667defgitConfig(key, typeSpecifier=None): 668if not _gitConfig.has_key(key): 669 cmd = ["git","config"] 670if typeSpecifier: 671 cmd += [ typeSpecifier ] 672 cmd += [ key ] 673 s =read_pipe(cmd, ignore_error=True) 674 _gitConfig[key] = s.strip() 675return _gitConfig[key] 676 677defgitConfigBool(key): 678"""Return a bool, using git config --bool. It is True only if the 679 variable is set to true, and False if set to false or not present 680 in the config.""" 681 682if not _gitConfig.has_key(key): 683 _gitConfig[key] =gitConfig(key,'--bool') =="true" 684return _gitConfig[key] 685 686defgitConfigInt(key): 687if not _gitConfig.has_key(key): 688 cmd = ["git","config","--int", key ] 689 s =read_pipe(cmd, ignore_error=True) 690 v = s.strip() 691try: 692 _gitConfig[key] =int(gitConfig(key,'--int')) 693exceptValueError: 694 _gitConfig[key] =None 695return _gitConfig[key] 696 697defgitConfigList(key): 698if not _gitConfig.has_key(key): 699 s =read_pipe(["git","config","--get-all", key], ignore_error=True) 700 _gitConfig[key] = s.strip().splitlines() 701if _gitConfig[key] == ['']: 702 _gitConfig[key] = [] 703return _gitConfig[key] 704 705defp4BranchesInGit(branchesAreInRemotes=True): 706"""Find all the branches whose names start with "p4/", looking 707 in remotes or heads as specified by the argument. Return 708 a dictionary of{ branch: revision }for each one found. 709 The branch names are the short names, without any 710 "p4/" prefix.""" 711 712 branches = {} 713 714 cmdline ="git rev-parse --symbolic " 715if branchesAreInRemotes: 716 cmdline +="--remotes" 717else: 718 cmdline +="--branches" 719 720for line inread_pipe_lines(cmdline): 721 line = line.strip() 722 723# only import to p4/ 724if not line.startswith('p4/'): 725continue 726# special symbolic ref to p4/master 727if line =="p4/HEAD": 728continue 729 730# strip off p4/ prefix 731 branch = line[len("p4/"):] 732 733 branches[branch] =parseRevision(line) 734 735return branches 736 737defbranch_exists(branch): 738"""Make sure that the given ref name really exists.""" 739 740 cmd = ["git","rev-parse","--symbolic","--verify", branch ] 741 p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 742 out, _ = p.communicate() 743if p.returncode: 744return False 745# expect exactly one line of output: the branch name 746return out.rstrip() == branch 747 748deffindUpstreamBranchPoint(head ="HEAD"): 749 branches =p4BranchesInGit() 750# map from depot-path to branch name 751 branchByDepotPath = {} 752for branch in branches.keys(): 753 tip = branches[branch] 754 log =extractLogMessageFromGitCommit(tip) 755 settings =extractSettingsGitLog(log) 756if settings.has_key("depot-paths"): 757 paths =",".join(settings["depot-paths"]) 758 branchByDepotPath[paths] ="remotes/p4/"+ branch 759 760 settings =None 761 parent =0 762while parent <65535: 763 commit = head +"~%s"% parent 764 log =extractLogMessageFromGitCommit(commit) 765 settings =extractSettingsGitLog(log) 766if settings.has_key("depot-paths"): 767 paths =",".join(settings["depot-paths"]) 768if branchByDepotPath.has_key(paths): 769return[branchByDepotPath[paths], settings] 770 771 parent = parent +1 772 773return["", settings] 774 775defcreateOrUpdateBranchesFromOrigin(localRefPrefix ="refs/remotes/p4/", silent=True): 776if not silent: 777print("Creating/updating branch(es) in%sbased on origin branch(es)" 778% localRefPrefix) 779 780 originPrefix ="origin/p4/" 781 782for line inread_pipe_lines("git rev-parse --symbolic --remotes"): 783 line = line.strip() 784if(not line.startswith(originPrefix))or line.endswith("HEAD"): 785continue 786 787 headName = line[len(originPrefix):] 788 remoteHead = localRefPrefix + headName 789 originHead = line 790 791 original =extractSettingsGitLog(extractLogMessageFromGitCommit(originHead)) 792if(not original.has_key('depot-paths') 793or not original.has_key('change')): 794continue 795 796 update =False 797if notgitBranchExists(remoteHead): 798if verbose: 799print"creating%s"% remoteHead 800 update =True 801else: 802 settings =extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead)) 803if settings.has_key('change') >0: 804if settings['depot-paths'] == original['depot-paths']: 805 originP4Change =int(original['change']) 806 p4Change =int(settings['change']) 807if originP4Change > p4Change: 808print("%s(%s) is newer than%s(%s). " 809"Updating p4 branch from origin." 810% (originHead, originP4Change, 811 remoteHead, p4Change)) 812 update =True 813else: 814print("Ignoring:%swas imported from%swhile " 815"%swas imported from%s" 816% (originHead,','.join(original['depot-paths']), 817 remoteHead,','.join(settings['depot-paths']))) 818 819if update: 820system("git update-ref%s %s"% (remoteHead, originHead)) 821 822deforiginP4BranchesExist(): 823returngitBranchExists("origin")orgitBranchExists("origin/p4")orgitBranchExists("origin/p4/master") 824 825 826defp4ParseNumericChangeRange(parts): 827 changeStart =int(parts[0][1:]) 828if parts[1] =='#head': 829 changeEnd =p4_last_change() 830else: 831 changeEnd =int(parts[1]) 832 833return(changeStart, changeEnd) 834 835defchooseBlockSize(blockSize): 836if blockSize: 837return blockSize 838else: 839return defaultBlockSize 840 841defp4ChangesForPaths(depotPaths, changeRange, requestedBlockSize): 842assert depotPaths 843 844# Parse the change range into start and end. Try to find integer 845# revision ranges as these can be broken up into blocks to avoid 846# hitting server-side limits (maxrows, maxscanresults). But if 847# that doesn't work, fall back to using the raw revision specifier 848# strings, without using block mode. 849 850if changeRange is None or changeRange =='': 851 changeStart =1 852 changeEnd =p4_last_change() 853 block_size =chooseBlockSize(requestedBlockSize) 854else: 855 parts = changeRange.split(',') 856assertlen(parts) ==2 857try: 858(changeStart, changeEnd) =p4ParseNumericChangeRange(parts) 859 block_size =chooseBlockSize(requestedBlockSize) 860except: 861 changeStart = parts[0][1:] 862 changeEnd = parts[1] 863if requestedBlockSize: 864die("cannot use --changes-block-size with non-numeric revisions") 865 block_size =None 866 867 changes =set() 868 869# Retrieve changes a block at a time, to prevent running 870# into a MaxResults/MaxScanRows error from the server. 871 872while True: 873 cmd = ['changes'] 874 875if block_size: 876 end =min(changeEnd, changeStart + block_size) 877 revisionRange ="%d,%d"% (changeStart, end) 878else: 879 revisionRange ="%s,%s"% (changeStart, changeEnd) 880 881for p in depotPaths: 882 cmd += ["%s...@%s"% (p, revisionRange)] 883 884# Insert changes in chronological order 885for entry inreversed(p4CmdList(cmd)): 886if entry.has_key('p4ExitCode'): 887die('Error retrieving changes descriptions ({})'.format(entry['p4ExitCode'])) 888if not entry.has_key('change'): 889continue 890 changes.add(int(entry['change'])) 891 892if not block_size: 893break 894 895if end >= changeEnd: 896break 897 898 changeStart = end +1 899 900 changes =sorted(changes) 901return changes 902 903defp4PathStartsWith(path, prefix): 904# This method tries to remedy a potential mixed-case issue: 905# 906# If UserA adds //depot/DirA/file1 907# and UserB adds //depot/dira/file2 908# 909# we may or may not have a problem. If you have core.ignorecase=true, 910# we treat DirA and dira as the same directory 911ifgitConfigBool("core.ignorecase"): 912return path.lower().startswith(prefix.lower()) 913return path.startswith(prefix) 914 915defgetClientSpec(): 916"""Look at the p4 client spec, create a View() object that contains 917 all the mappings, and return it.""" 918 919 specList =p4CmdList("client -o") 920iflen(specList) !=1: 921die('Output from "client -o" is%dlines, expecting 1'% 922len(specList)) 923 924# dictionary of all client parameters 925 entry = specList[0] 926 927# the //client/ name 928 client_name = entry["Client"] 929 930# just the keys that start with "View" 931 view_keys = [ k for k in entry.keys()if k.startswith("View") ] 932 933# hold this new View 934 view =View(client_name) 935 936# append the lines, in order, to the view 937for view_num inrange(len(view_keys)): 938 k ="View%d"% view_num 939if k not in view_keys: 940die("Expected view key%smissing"% k) 941 view.append(entry[k]) 942 943return view 944 945defgetClientRoot(): 946"""Grab the client directory.""" 947 948 output =p4CmdList("client -o") 949iflen(output) !=1: 950die('Output from "client -o" is%dlines, expecting 1'%len(output)) 951 952 entry = output[0] 953if"Root"not in entry: 954die('Client has no "Root"') 955 956return entry["Root"] 957 958# 959# P4 wildcards are not allowed in filenames. P4 complains 960# if you simply add them, but you can force it with "-f", in 961# which case it translates them into %xx encoding internally. 962# 963defwildcard_decode(path): 964# Search for and fix just these four characters. Do % last so 965# that fixing it does not inadvertently create new %-escapes. 966# Cannot have * in a filename in windows; untested as to 967# what p4 would do in such a case. 968if not platform.system() =="Windows": 969 path = path.replace("%2A","*") 970 path = path.replace("%23","#") \ 971.replace("%40","@") \ 972.replace("%25","%") 973return path 974 975defwildcard_encode(path): 976# do % first to avoid double-encoding the %s introduced here 977 path = path.replace("%","%25") \ 978.replace("*","%2A") \ 979.replace("#","%23") \ 980.replace("@","%40") 981return path 982 983defwildcard_present(path): 984 m = re.search("[*#@%]", path) 985return m is not None 986 987classLargeFileSystem(object): 988"""Base class for large file system support.""" 989 990def__init__(self, writeToGitStream): 991 self.largeFiles =set() 992 self.writeToGitStream = writeToGitStream 993 994defgeneratePointer(self, cloneDestination, contentFile): 995"""Return the content of a pointer file that is stored in Git instead of 996 the actual content.""" 997assert False,"Method 'generatePointer' required in "+ self.__class__.__name__ 998 999defpushFile(self, localLargeFile):1000"""Push the actual content which is not stored in the Git repository to1001 a server."""1002assert False,"Method 'pushFile' required in "+ self.__class__.__name__10031004defhasLargeFileExtension(self, relPath):1005returnreduce(1006lambda a, b: a or b,1007[relPath.endswith('.'+ e)for e ingitConfigList('git-p4.largeFileExtensions')],1008False1009)10101011defgenerateTempFile(self, contents):1012 contentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=False)1013for d in contents:1014 contentFile.write(d)1015 contentFile.close()1016return contentFile.name10171018defexceedsLargeFileThreshold(self, relPath, contents):1019ifgitConfigInt('git-p4.largeFileThreshold'):1020 contentsSize =sum(len(d)for d in contents)1021if contentsSize >gitConfigInt('git-p4.largeFileThreshold'):1022return True1023ifgitConfigInt('git-p4.largeFileCompressedThreshold'):1024 contentsSize =sum(len(d)for d in contents)1025if contentsSize <=gitConfigInt('git-p4.largeFileCompressedThreshold'):1026return False1027 contentTempFile = self.generateTempFile(contents)1028 compressedContentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=False)1029 zf = zipfile.ZipFile(compressedContentFile.name, mode='w')1030 zf.write(contentTempFile, compress_type=zipfile.ZIP_DEFLATED)1031 zf.close()1032 compressedContentsSize = zf.infolist()[0].compress_size1033 os.remove(contentTempFile)1034 os.remove(compressedContentFile.name)1035if compressedContentsSize >gitConfigInt('git-p4.largeFileCompressedThreshold'):1036return True1037return False10381039defaddLargeFile(self, relPath):1040 self.largeFiles.add(relPath)10411042defremoveLargeFile(self, relPath):1043 self.largeFiles.remove(relPath)10441045defisLargeFile(self, relPath):1046return relPath in self.largeFiles10471048defprocessContent(self, git_mode, relPath, contents):1049"""Processes the content of git fast import. This method decides if a1050 file is stored in the large file system and handles all necessary1051 steps."""1052if self.exceedsLargeFileThreshold(relPath, contents)or self.hasLargeFileExtension(relPath):1053 contentTempFile = self.generateTempFile(contents)1054(pointer_git_mode, contents, localLargeFile) = self.generatePointer(contentTempFile)1055if pointer_git_mode:1056 git_mode = pointer_git_mode1057if localLargeFile:1058# Move temp file to final location in large file system1059 largeFileDir = os.path.dirname(localLargeFile)1060if not os.path.isdir(largeFileDir):1061 os.makedirs(largeFileDir)1062 shutil.move(contentTempFile, localLargeFile)1063 self.addLargeFile(relPath)1064ifgitConfigBool('git-p4.largeFilePush'):1065 self.pushFile(localLargeFile)1066if verbose:1067 sys.stderr.write("%smoved to large file system (%s)\n"% (relPath, localLargeFile))1068return(git_mode, contents)10691070classMockLFS(LargeFileSystem):1071"""Mock large file system for testing."""10721073defgeneratePointer(self, contentFile):1074"""The pointer content is the original content prefixed with "pointer-".1075 The local filename of the large file storage is derived from the file content.1076 """1077withopen(contentFile,'r')as f:1078 content =next(f)1079 gitMode ='100644'1080 pointerContents ='pointer-'+ content1081 localLargeFile = os.path.join(os.getcwd(),'.git','mock-storage','local', content[:-1])1082return(gitMode, pointerContents, localLargeFile)10831084defpushFile(self, localLargeFile):1085"""The remote filename of the large file storage is the same as the local1086 one but in a different directory.1087 """1088 remotePath = os.path.join(os.path.dirname(localLargeFile),'..','remote')1089if not os.path.exists(remotePath):1090 os.makedirs(remotePath)1091 shutil.copyfile(localLargeFile, os.path.join(remotePath, os.path.basename(localLargeFile)))10921093classGitLFS(LargeFileSystem):1094"""Git LFS as backend for the git-p4 large file system.1095 See https://git-lfs.github.com/ for details."""10961097def__init__(self, *args):1098 LargeFileSystem.__init__(self, *args)1099 self.baseGitAttributes = []11001101defgeneratePointer(self, contentFile):1102"""Generate a Git LFS pointer for the content. Return LFS Pointer file1103 mode and content which is stored in the Git repository instead of1104 the actual content. Return also the new location of the actual1105 content.1106 """1107if os.path.getsize(contentFile) ==0:1108return(None,'',None)11091110 pointerProcess = subprocess.Popen(1111['git','lfs','pointer','--file='+ contentFile],1112 stdout=subprocess.PIPE1113)1114 pointerFile = pointerProcess.stdout.read()1115if pointerProcess.wait():1116 os.remove(contentFile)1117die('git-lfs pointer command failed. Did you install the extension?')11181119# Git LFS removed the preamble in the output of the 'pointer' command1120# starting from version 1.2.0. Check for the preamble here to support1121# earlier versions.1122# c.f. https://github.com/github/git-lfs/commit/da2935d9a739592bc775c98d8ef4df9c72ea3b431123if pointerFile.startswith('Git LFS pointer for'):1124 pointerFile = re.sub(r'Git LFS pointer for.*\n\n','', pointerFile)11251126 oid = re.search(r'^oid \w+:(\w+)', pointerFile, re.MULTILINE).group(1)1127 localLargeFile = os.path.join(1128 os.getcwd(),1129'.git','lfs','objects', oid[:2], oid[2:4],1130 oid,1131)1132# LFS Spec states that pointer files should not have the executable bit set.1133 gitMode ='100644'1134return(gitMode, pointerFile, localLargeFile)11351136defpushFile(self, localLargeFile):1137 uploadProcess = subprocess.Popen(1138['git','lfs','push','--object-id','origin', os.path.basename(localLargeFile)]1139)1140if uploadProcess.wait():1141die('git-lfs push command failed. Did you define a remote?')11421143defgenerateGitAttributes(self):1144return(1145 self.baseGitAttributes +1146[1147'\n',1148'#\n',1149'# Git LFS (see https://git-lfs.github.com/)\n',1150'#\n',1151] +1152['*.'+ f.replace(' ','[[:space:]]') +' filter=lfs diff=lfs merge=lfs -text\n'1153for f insorted(gitConfigList('git-p4.largeFileExtensions'))1154] +1155['/'+ f.replace(' ','[[:space:]]') +' filter=lfs diff=lfs merge=lfs -text\n'1156for f insorted(self.largeFiles)if not self.hasLargeFileExtension(f)1157]1158)11591160defaddLargeFile(self, relPath):1161 LargeFileSystem.addLargeFile(self, relPath)1162 self.writeToGitStream('100644','.gitattributes', self.generateGitAttributes())11631164defremoveLargeFile(self, relPath):1165 LargeFileSystem.removeLargeFile(self, relPath)1166 self.writeToGitStream('100644','.gitattributes', self.generateGitAttributes())11671168defprocessContent(self, git_mode, relPath, contents):1169if relPath =='.gitattributes':1170 self.baseGitAttributes = contents1171return(git_mode, self.generateGitAttributes())1172else:1173return LargeFileSystem.processContent(self, git_mode, relPath, contents)11741175class Command:1176def__init__(self):1177 self.usage ="usage: %prog [options]"1178 self.needsGit =True1179 self.verbose =False11801181# This is required for the "append" cloneExclude action1182defensure_value(self, attr, value):1183if nothasattr(self, attr)orgetattr(self, attr)is None:1184setattr(self, attr, value)1185returngetattr(self, attr)11861187class P4UserMap:1188def__init__(self):1189 self.userMapFromPerforceServer =False1190 self.myP4UserId =None11911192defp4UserId(self):1193if self.myP4UserId:1194return self.myP4UserId11951196 results =p4CmdList("user -o")1197for r in results:1198if r.has_key('User'):1199 self.myP4UserId = r['User']1200return r['User']1201die("Could not find your p4 user id")12021203defp4UserIsMe(self, p4User):1204# return True if the given p4 user is actually me1205 me = self.p4UserId()1206if not p4User or p4User != me:1207return False1208else:1209return True12101211defgetUserCacheFilename(self):1212 home = os.environ.get("HOME", os.environ.get("USERPROFILE"))1213return home +"/.gitp4-usercache.txt"12141215defgetUserMapFromPerforceServer(self):1216if self.userMapFromPerforceServer:1217return1218 self.users = {}1219 self.emails = {}12201221for output inp4CmdList("users"):1222if not output.has_key("User"):1223continue1224 self.users[output["User"]] = output["FullName"] +" <"+ output["Email"] +">"1225 self.emails[output["Email"]] = output["User"]12261227 mapUserConfigRegex = re.compile(r"^\s*(\S+)\s*=\s*(.+)\s*<(\S+)>\s*$", re.VERBOSE)1228for mapUserConfig ingitConfigList("git-p4.mapUser"):1229 mapUser = mapUserConfigRegex.findall(mapUserConfig)1230if mapUser andlen(mapUser[0]) ==3:1231 user = mapUser[0][0]1232 fullname = mapUser[0][1]1233 email = mapUser[0][2]1234 self.users[user] = fullname +" <"+ email +">"1235 self.emails[email] = user12361237 s =''1238for(key, val)in self.users.items():1239 s +="%s\t%s\n"% (key.expandtabs(1), val.expandtabs(1))12401241open(self.getUserCacheFilename(),"wb").write(s)1242 self.userMapFromPerforceServer =True12431244defloadUserMapFromCache(self):1245 self.users = {}1246 self.userMapFromPerforceServer =False1247try:1248 cache =open(self.getUserCacheFilename(),"rb")1249 lines = cache.readlines()1250 cache.close()1251for line in lines:1252 entry = line.strip().split("\t")1253 self.users[entry[0]] = entry[1]1254exceptIOError:1255 self.getUserMapFromPerforceServer()12561257classP4Debug(Command):1258def__init__(self):1259 Command.__init__(self)1260 self.options = []1261 self.description ="A tool to debug the output of p4 -G."1262 self.needsGit =False12631264defrun(self, args):1265 j =01266for output inp4CmdList(args):1267print'Element:%d'% j1268 j +=11269print output1270return True12711272classP4RollBack(Command):1273def__init__(self):1274 Command.__init__(self)1275 self.options = [1276 optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true")1277]1278 self.description ="A tool to debug the multi-branch import. Don't use :)"1279 self.rollbackLocalBranches =False12801281defrun(self, args):1282iflen(args) !=1:1283return False1284 maxChange =int(args[0])12851286if"p4ExitCode"inp4Cmd("changes -m 1"):1287die("Problems executing p4");12881289if self.rollbackLocalBranches:1290 refPrefix ="refs/heads/"1291 lines =read_pipe_lines("git rev-parse --symbolic --branches")1292else:1293 refPrefix ="refs/remotes/"1294 lines =read_pipe_lines("git rev-parse --symbolic --remotes")12951296for line in lines:1297if self.rollbackLocalBranches or(line.startswith("p4/")and line !="p4/HEAD\n"):1298 line = line.strip()1299 ref = refPrefix + line1300 log =extractLogMessageFromGitCommit(ref)1301 settings =extractSettingsGitLog(log)13021303 depotPaths = settings['depot-paths']1304 change = settings['change']13051306 changed =False13071308iflen(p4Cmd("changes -m 1 "+' '.join(['%s...@%s'% (p, maxChange)1309for p in depotPaths]))) ==0:1310print"Branch%sdid not exist at change%s, deleting."% (ref, maxChange)1311system("git update-ref -d%s`git rev-parse%s`"% (ref, ref))1312continue13131314while change andint(change) > maxChange:1315 changed =True1316if self.verbose:1317print"%sis at%s; rewinding towards%s"% (ref, change, maxChange)1318system("git update-ref%s\"%s^\""% (ref, ref))1319 log =extractLogMessageFromGitCommit(ref)1320 settings =extractSettingsGitLog(log)132113221323 depotPaths = settings['depot-paths']1324 change = settings['change']13251326if changed:1327print"%srewound to%s"% (ref, change)13281329return True13301331classP4Submit(Command, P4UserMap):13321333 conflict_behavior_choices = ("ask","skip","quit")13341335def__init__(self):1336 Command.__init__(self)1337 P4UserMap.__init__(self)1338 self.options = [1339 optparse.make_option("--origin", dest="origin"),1340 optparse.make_option("-M", dest="detectRenames", action="store_true"),1341# preserve the user, requires relevant p4 permissions1342 optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"),1343 optparse.make_option("--export-labels", dest="exportLabels", action="store_true"),1344 optparse.make_option("--dry-run","-n", dest="dry_run", action="store_true"),1345 optparse.make_option("--prepare-p4-only", dest="prepare_p4_only", action="store_true"),1346 optparse.make_option("--conflict", dest="conflict_behavior",1347 choices=self.conflict_behavior_choices),1348 optparse.make_option("--branch", dest="branch"),1349 optparse.make_option("--shelve", dest="shelve", action="store_true",1350help="Shelve instead of submit. Shelved files are reverted, "1351"restoring the workspace to the state before the shelve"),1352 optparse.make_option("--update-shelve", dest="update_shelve", action="append",type="int",1353 metavar="CHANGELIST",1354help="update an existing shelved changelist, implies --shelve, "1355"repeat in-order for multiple shelved changelists")1356]1357 self.description ="Submit changes from git to the perforce depot."1358 self.usage +=" [name of git branch to submit into perforce depot]"1359 self.origin =""1360 self.detectRenames =False1361 self.preserveUser =gitConfigBool("git-p4.preserveUser")1362 self.dry_run =False1363 self.shelve =False1364 self.update_shelve =list()1365 self.prepare_p4_only =False1366 self.conflict_behavior =None1367 self.isWindows = (platform.system() =="Windows")1368 self.exportLabels =False1369 self.p4HasMoveCommand =p4_has_move_command()1370 self.branch =None13711372ifgitConfig('git-p4.largeFileSystem'):1373die("Large file system not supported for git-p4 submit command. Please remove it from config.")13741375defcheck(self):1376iflen(p4CmdList("opened ...")) >0:1377die("You have files opened with perforce! Close them before starting the sync.")13781379defseparate_jobs_from_description(self, message):1380"""Extract and return a possible Jobs field in the commit1381 message. It goes into a separate section in the p4 change1382 specification.13831384 A jobs line starts with "Jobs:" and looks like a new field1385 in a form. Values are white-space separated on the same1386 line or on following lines that start with a tab.13871388 This does not parse and extract the full git commit message1389 like a p4 form. It just sees the Jobs: line as a marker1390 to pass everything from then on directly into the p4 form,1391 but outside the description section.13921393 Return a tuple (stripped log message, jobs string)."""13941395 m = re.search(r'^Jobs:', message, re.MULTILINE)1396if m is None:1397return(message,None)13981399 jobtext = message[m.start():]1400 stripped_message = message[:m.start()].rstrip()1401return(stripped_message, jobtext)14021403defprepareLogMessage(self, template, message, jobs):1404"""Edits the template returned from "p4 change -o" to insert1405 the message in the Description field, and the jobs text in1406 the Jobs field."""1407 result =""14081409 inDescriptionSection =False14101411for line in template.split("\n"):1412if line.startswith("#"):1413 result += line +"\n"1414continue14151416if inDescriptionSection:1417if line.startswith("Files:")or line.startswith("Jobs:"):1418 inDescriptionSection =False1419# insert Jobs section1420if jobs:1421 result += jobs +"\n"1422else:1423continue1424else:1425if line.startswith("Description:"):1426 inDescriptionSection =True1427 line +="\n"1428for messageLine in message.split("\n"):1429 line +="\t"+ messageLine +"\n"14301431 result += line +"\n"14321433return result14341435defpatchRCSKeywords(self,file, pattern):1436# Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern1437(handle, outFileName) = tempfile.mkstemp(dir='.')1438try:1439 outFile = os.fdopen(handle,"w+")1440 inFile =open(file,"r")1441 regexp = re.compile(pattern, re.VERBOSE)1442for line in inFile.readlines():1443 line = regexp.sub(r'$\1$', line)1444 outFile.write(line)1445 inFile.close()1446 outFile.close()1447# Forcibly overwrite the original file1448 os.unlink(file)1449 shutil.move(outFileName,file)1450except:1451# cleanup our temporary file1452 os.unlink(outFileName)1453print"Failed to strip RCS keywords in%s"%file1454raise14551456print"Patched up RCS keywords in%s"%file14571458defp4UserForCommit(self,id):1459# Return the tuple (perforce user,git email) for a given git commit id1460 self.getUserMapFromPerforceServer()1461 gitEmail =read_pipe(["git","log","--max-count=1",1462"--format=%ae",id])1463 gitEmail = gitEmail.strip()1464if not self.emails.has_key(gitEmail):1465return(None,gitEmail)1466else:1467return(self.emails[gitEmail],gitEmail)14681469defcheckValidP4Users(self,commits):1470# check if any git authors cannot be mapped to p4 users1471foridin commits:1472(user,email) = self.p4UserForCommit(id)1473if not user:1474 msg ="Cannot find p4 user for email%sin commit%s."% (email,id)1475ifgitConfigBool("git-p4.allowMissingP4Users"):1476print"%s"% msg1477else:1478die("Error:%s\nSet git-p4.allowMissingP4Users to true to allow this."% msg)14791480deflastP4Changelist(self):1481# Get back the last changelist number submitted in this client spec. This1482# then gets used to patch up the username in the change. If the same1483# client spec is being used by multiple processes then this might go1484# wrong.1485 results =p4CmdList("client -o")# find the current client1486 client =None1487for r in results:1488if r.has_key('Client'):1489 client = r['Client']1490break1491if not client:1492die("could not get client spec")1493 results =p4CmdList(["changes","-c", client,"-m","1"])1494for r in results:1495if r.has_key('change'):1496return r['change']1497die("Could not get changelist number for last submit - cannot patch up user details")14981499defmodifyChangelistUser(self, changelist, newUser):1500# fixup the user field of a changelist after it has been submitted.1501 changes =p4CmdList("change -o%s"% changelist)1502iflen(changes) !=1:1503die("Bad output from p4 change modifying%sto user%s"%1504(changelist, newUser))15051506 c = changes[0]1507if c['User'] == newUser:return# nothing to do1508 c['User'] = newUser1509input= marshal.dumps(c)15101511 result =p4CmdList("change -f -i", stdin=input)1512for r in result:1513if r.has_key('code'):1514if r['code'] =='error':1515die("Could not modify user field of changelist%sto%s:%s"% (changelist, newUser, r['data']))1516if r.has_key('data'):1517print("Updated user field for changelist%sto%s"% (changelist, newUser))1518return1519die("Could not modify user field of changelist%sto%s"% (changelist, newUser))15201521defcanChangeChangelists(self):1522# check to see if we have p4 admin or super-user permissions, either of1523# which are required to modify changelists.1524 results =p4CmdList(["protects", self.depotPath])1525for r in results:1526if r.has_key('perm'):1527if r['perm'] =='admin':1528return11529if r['perm'] =='super':1530return11531return015321533defprepareSubmitTemplate(self, changelist=None):1534"""Run "p4 change -o" to grab a change specification template.1535 This does not use "p4 -G", as it is nice to keep the submission1536 template in original order, since a human might edit it.15371538 Remove lines in the Files section that show changes to files1539 outside the depot path we're committing into."""15401541[upstream, settings] =findUpstreamBranchPoint()15421543 template ="""\1544# A Perforce Change Specification.1545#1546# Change: The change number. 'new' on a new changelist.1547# Date: The date this specification was last modified.1548# Client: The client on which the changelist was created. Read-only.1549# User: The user who created the changelist.1550# Status: Either 'pending' or 'submitted'. Read-only.1551# Type: Either 'public' or 'restricted'. Default is 'public'.1552# Description: Comments about the changelist. Required.1553# Jobs: What opened jobs are to be closed by this changelist.1554# You may delete jobs from this list. (New changelists only.)1555# Files: What opened files from the default changelist are to be added1556# to this changelist. You may delete files from this list.1557# (New changelists only.)1558"""1559 files_list = []1560 inFilesSection =False1561 change_entry =None1562 args = ['change','-o']1563if changelist:1564 args.append(str(changelist))1565for entry inp4CmdList(args):1566if not entry.has_key('code'):1567continue1568if entry['code'] =='stat':1569 change_entry = entry1570break1571if not change_entry:1572die('Failed to decode output of p4 change -o')1573for key, value in change_entry.iteritems():1574if key.startswith('File'):1575if settings.has_key('depot-paths'):1576if not[p for p in settings['depot-paths']1577ifp4PathStartsWith(value, p)]:1578continue1579else:1580if notp4PathStartsWith(value, self.depotPath):1581continue1582 files_list.append(value)1583continue1584# Output in the order expected by prepareLogMessage1585for key in['Change','Client','User','Status','Description','Jobs']:1586if not change_entry.has_key(key):1587continue1588 template +='\n'1589 template += key +':'1590if key =='Description':1591 template +='\n'1592for field_line in change_entry[key].splitlines():1593 template +='\t'+field_line+'\n'1594iflen(files_list) >0:1595 template +='\n'1596 template +='Files:\n'1597for path in files_list:1598 template +='\t'+path+'\n'1599return template16001601defedit_template(self, template_file):1602"""Invoke the editor to let the user change the submission1603 message. Return true if okay to continue with the submit."""16041605# if configured to skip the editing part, just submit1606ifgitConfigBool("git-p4.skipSubmitEdit"):1607return True16081609# look at the modification time, to check later if the user saved1610# the file1611 mtime = os.stat(template_file).st_mtime16121613# invoke the editor1614if os.environ.has_key("P4EDITOR")and(os.environ.get("P4EDITOR") !=""):1615 editor = os.environ.get("P4EDITOR")1616else:1617 editor =read_pipe("git var GIT_EDITOR").strip()1618system(["sh","-c", ('%s"$@"'% editor), editor, template_file])16191620# If the file was not saved, prompt to see if this patch should1621# be skipped. But skip this verification step if configured so.1622ifgitConfigBool("git-p4.skipSubmitEditCheck"):1623return True16241625# modification time updated means user saved the file1626if os.stat(template_file).st_mtime > mtime:1627return True16281629while True:1630 response =raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")1631if response =='y':1632return True1633if response =='n':1634return False16351636defget_diff_description(self, editedFiles, filesToAdd, symlinks):1637# diff1638if os.environ.has_key("P4DIFF"):1639del(os.environ["P4DIFF"])1640 diff =""1641for editedFile in editedFiles:1642 diff +=p4_read_pipe(['diff','-du',1643wildcard_encode(editedFile)])16441645# new file diff1646 newdiff =""1647for newFile in filesToAdd:1648 newdiff +="==== new file ====\n"1649 newdiff +="--- /dev/null\n"1650 newdiff +="+++%s\n"% newFile16511652 is_link = os.path.islink(newFile)1653 expect_link = newFile in symlinks16541655if is_link and expect_link:1656 newdiff +="+%s\n"% os.readlink(newFile)1657else:1658 f =open(newFile,"r")1659for line in f.readlines():1660 newdiff +="+"+ line1661 f.close()16621663return(diff + newdiff).replace('\r\n','\n')16641665defapplyCommit(self,id):1666"""Apply one commit, return True if it succeeded."""16671668print"Applying",read_pipe(["git","show","-s",1669"--format=format:%h%s",id])16701671(p4User, gitEmail) = self.p4UserForCommit(id)16721673 diff =read_pipe_lines("git diff-tree -r%s\"%s^\" \"%s\""% (self.diffOpts,id,id))1674 filesToAdd =set()1675 filesToChangeType =set()1676 filesToDelete =set()1677 editedFiles =set()1678 pureRenameCopy =set()1679 symlinks =set()1680 filesToChangeExecBit = {}1681 all_files =list()16821683for line in diff:1684 diff =parseDiffTreeEntry(line)1685 modifier = diff['status']1686 path = diff['src']1687 all_files.append(path)16881689if modifier =="M":1690p4_edit(path)1691ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1692 filesToChangeExecBit[path] = diff['dst_mode']1693 editedFiles.add(path)1694elif modifier =="A":1695 filesToAdd.add(path)1696 filesToChangeExecBit[path] = diff['dst_mode']1697if path in filesToDelete:1698 filesToDelete.remove(path)16991700 dst_mode =int(diff['dst_mode'],8)1701if dst_mode ==0120000:1702 symlinks.add(path)17031704elif modifier =="D":1705 filesToDelete.add(path)1706if path in filesToAdd:1707 filesToAdd.remove(path)1708elif modifier =="C":1709 src, dest = diff['src'], diff['dst']1710p4_integrate(src, dest)1711 pureRenameCopy.add(dest)1712if diff['src_sha1'] != diff['dst_sha1']:1713p4_edit(dest)1714 pureRenameCopy.discard(dest)1715ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1716p4_edit(dest)1717 pureRenameCopy.discard(dest)1718 filesToChangeExecBit[dest] = diff['dst_mode']1719if self.isWindows:1720# turn off read-only attribute1721 os.chmod(dest, stat.S_IWRITE)1722 os.unlink(dest)1723 editedFiles.add(dest)1724elif modifier =="R":1725 src, dest = diff['src'], diff['dst']1726if self.p4HasMoveCommand:1727p4_edit(src)# src must be open before move1728p4_move(src, dest)# opens for (move/delete, move/add)1729else:1730p4_integrate(src, dest)1731if diff['src_sha1'] != diff['dst_sha1']:1732p4_edit(dest)1733else:1734 pureRenameCopy.add(dest)1735ifisModeExecChanged(diff['src_mode'], diff['dst_mode']):1736if not self.p4HasMoveCommand:1737p4_edit(dest)# with move: already open, writable1738 filesToChangeExecBit[dest] = diff['dst_mode']1739if not self.p4HasMoveCommand:1740if self.isWindows:1741 os.chmod(dest, stat.S_IWRITE)1742 os.unlink(dest)1743 filesToDelete.add(src)1744 editedFiles.add(dest)1745elif modifier =="T":1746 filesToChangeType.add(path)1747else:1748die("unknown modifier%sfor%s"% (modifier, path))17491750 diffcmd ="git diff-tree --full-index -p\"%s\""% (id)1751 patchcmd = diffcmd +" | git apply "1752 tryPatchCmd = patchcmd +"--check -"1753 applyPatchCmd = patchcmd +"--check --apply -"1754 patch_succeeded =True17551756if os.system(tryPatchCmd) !=0:1757 fixed_rcs_keywords =False1758 patch_succeeded =False1759print"Unfortunately applying the change failed!"17601761# Patch failed, maybe it's just RCS keyword woes. Look through1762# the patch to see if that's possible.1763ifgitConfigBool("git-p4.attemptRCSCleanup"):1764file=None1765 pattern =None1766 kwfiles = {}1767forfilein editedFiles | filesToDelete:1768# did this file's delta contain RCS keywords?1769 pattern =p4_keywords_regexp_for_file(file)17701771if pattern:1772# this file is a possibility...look for RCS keywords.1773 regexp = re.compile(pattern, re.VERBOSE)1774for line inread_pipe_lines(["git","diff","%s^..%s"% (id,id),file]):1775if regexp.search(line):1776if verbose:1777print"got keyword match on%sin%sin%s"% (pattern, line,file)1778 kwfiles[file] = pattern1779break17801781forfilein kwfiles:1782if verbose:1783print"zapping%swith%s"% (line,pattern)1784# File is being deleted, so not open in p4. Must1785# disable the read-only bit on windows.1786if self.isWindows andfilenot in editedFiles:1787 os.chmod(file, stat.S_IWRITE)1788 self.patchRCSKeywords(file, kwfiles[file])1789 fixed_rcs_keywords =True17901791if fixed_rcs_keywords:1792print"Retrying the patch with RCS keywords cleaned up"1793if os.system(tryPatchCmd) ==0:1794 patch_succeeded =True17951796if not patch_succeeded:1797for f in editedFiles:1798p4_revert(f)1799return False18001801#1802# Apply the patch for real, and do add/delete/+x handling.1803#1804system(applyPatchCmd)18051806for f in filesToChangeType:1807p4_edit(f,"-t","auto")1808for f in filesToAdd:1809p4_add(f)1810for f in filesToDelete:1811p4_revert(f)1812p4_delete(f)18131814# Set/clear executable bits1815for f in filesToChangeExecBit.keys():1816 mode = filesToChangeExecBit[f]1817setP4ExecBit(f, mode)18181819 update_shelve =01820iflen(self.update_shelve) >0:1821 update_shelve = self.update_shelve.pop(0)1822p4_reopen_in_change(update_shelve, all_files)18231824#1825# Build p4 change description, starting with the contents1826# of the git commit message.1827#1828 logMessage =extractLogMessageFromGitCommit(id)1829 logMessage = logMessage.strip()1830(logMessage, jobs) = self.separate_jobs_from_description(logMessage)18311832 template = self.prepareSubmitTemplate(update_shelve)1833 submitTemplate = self.prepareLogMessage(template, logMessage, jobs)18341835if self.preserveUser:1836 submitTemplate +="\n######## Actual user%s, modified after commit\n"% p4User18371838if self.checkAuthorship and not self.p4UserIsMe(p4User):1839 submitTemplate +="######## git author%sdoes not match your p4 account.\n"% gitEmail1840 submitTemplate +="######## Use option --preserve-user to modify authorship.\n"1841 submitTemplate +="######## Variable git-p4.skipUserNameCheck hides this message.\n"18421843 separatorLine ="######## everything below this line is just the diff #######\n"1844if not self.prepare_p4_only:1845 submitTemplate += separatorLine1846 submitTemplate += self.get_diff_description(editedFiles, filesToAdd, symlinks)18471848(handle, fileName) = tempfile.mkstemp()1849 tmpFile = os.fdopen(handle,"w+b")1850if self.isWindows:1851 submitTemplate = submitTemplate.replace("\n","\r\n")1852 tmpFile.write(submitTemplate)1853 tmpFile.close()18541855if self.prepare_p4_only:1856#1857# Leave the p4 tree prepared, and the submit template around1858# and let the user decide what to do next1859#1860print1861print"P4 workspace prepared for submission."1862print"To submit or revert, go to client workspace"1863print" "+ self.clientPath1864print1865print"To submit, use\"p4 submit\"to write a new description,"1866print"or\"p4 submit -i <%s\"to use the one prepared by" \1867"\"git p4\"."% fileName1868print"You can delete the file\"%s\"when finished."% fileName18691870if self.preserveUser and p4User and not self.p4UserIsMe(p4User):1871print"To preserve change ownership by user%s, you must\n" \1872"do\"p4 change -f <change>\"after submitting and\n" \1873"edit the User field."1874if pureRenameCopy:1875print"After submitting, renamed files must be re-synced."1876print"Invoke\"p4 sync -f\"on each of these files:"1877for f in pureRenameCopy:1878print" "+ f18791880print1881print"To revert the changes, use\"p4 revert ...\", and delete"1882print"the submit template file\"%s\""% fileName1883if filesToAdd:1884print"Since the commit adds new files, they must be deleted:"1885for f in filesToAdd:1886print" "+ f1887print1888return True18891890#1891# Let the user edit the change description, then submit it.1892#1893 submitted =False18941895try:1896if self.edit_template(fileName):1897# read the edited message and submit1898 tmpFile =open(fileName,"rb")1899 message = tmpFile.read()1900 tmpFile.close()1901if self.isWindows:1902 message = message.replace("\r\n","\n")1903 submitTemplate = message[:message.index(separatorLine)]19041905if update_shelve:1906p4_write_pipe(['shelve','-r','-i'], submitTemplate)1907elif self.shelve:1908p4_write_pipe(['shelve','-i'], submitTemplate)1909else:1910p4_write_pipe(['submit','-i'], submitTemplate)1911# The rename/copy happened by applying a patch that created a1912# new file. This leaves it writable, which confuses p4.1913for f in pureRenameCopy:1914p4_sync(f,"-f")19151916if self.preserveUser:1917if p4User:1918# Get last changelist number. Cannot easily get it from1919# the submit command output as the output is1920# unmarshalled.1921 changelist = self.lastP4Changelist()1922 self.modifyChangelistUser(changelist, p4User)19231924 submitted =True19251926finally:1927# skip this patch1928if not submitted or self.shelve:1929if self.shelve:1930print("Reverting shelved files.")1931else:1932print("Submission cancelled, undoing p4 changes.")1933for f in editedFiles | filesToDelete:1934p4_revert(f)1935for f in filesToAdd:1936p4_revert(f)1937 os.remove(f)19381939 os.remove(fileName)1940return submitted19411942# Export git tags as p4 labels. Create a p4 label and then tag1943# with that.1944defexportGitTags(self, gitTags):1945 validLabelRegexp =gitConfig("git-p4.labelExportRegexp")1946iflen(validLabelRegexp) ==0:1947 validLabelRegexp = defaultLabelRegexp1948 m = re.compile(validLabelRegexp)19491950for name in gitTags:19511952if not m.match(name):1953if verbose:1954print"tag%sdoes not match regexp%s"% (name, validLabelRegexp)1955continue19561957# Get the p4 commit this corresponds to1958 logMessage =extractLogMessageFromGitCommit(name)1959 values =extractSettingsGitLog(logMessage)19601961if not values.has_key('change'):1962# a tag pointing to something not sent to p4; ignore1963if verbose:1964print"git tag%sdoes not give a p4 commit"% name1965continue1966else:1967 changelist = values['change']19681969# Get the tag details.1970 inHeader =True1971 isAnnotated =False1972 body = []1973for l inread_pipe_lines(["git","cat-file","-p", name]):1974 l = l.strip()1975if inHeader:1976if re.match(r'tag\s+', l):1977 isAnnotated =True1978elif re.match(r'\s*$', l):1979 inHeader =False1980continue1981else:1982 body.append(l)19831984if not isAnnotated:1985 body = ["lightweight tag imported by git p4\n"]19861987# Create the label - use the same view as the client spec we are using1988 clientSpec =getClientSpec()19891990 labelTemplate ="Label:%s\n"% name1991 labelTemplate +="Description:\n"1992for b in body:1993 labelTemplate +="\t"+ b +"\n"1994 labelTemplate +="View:\n"1995for depot_side in clientSpec.mappings:1996 labelTemplate +="\t%s\n"% depot_side19971998if self.dry_run:1999print"Would create p4 label%sfor tag"% name2000elif self.prepare_p4_only:2001print"Not creating p4 label%sfor tag due to option" \2002" --prepare-p4-only"% name2003else:2004p4_write_pipe(["label","-i"], labelTemplate)20052006# Use the label2007p4_system(["tag","-l", name] +2008["%s@%s"% (depot_side, changelist)for depot_side in clientSpec.mappings])20092010if verbose:2011print"created p4 label for tag%s"% name20122013defrun(self, args):2014iflen(args) ==0:2015 self.master =currentGitBranch()2016eliflen(args) ==1:2017 self.master = args[0]2018if notbranchExists(self.master):2019die("Branch%sdoes not exist"% self.master)2020else:2021return False20222023for i in self.update_shelve:2024if i <=0:2025 sys.exit("invalid changelist%d"% i)20262027if self.master:2028 allowSubmit =gitConfig("git-p4.allowSubmit")2029iflen(allowSubmit) >0and not self.master in allowSubmit.split(","):2030die("%sis not in git-p4.allowSubmit"% self.master)20312032[upstream, settings] =findUpstreamBranchPoint()2033 self.depotPath = settings['depot-paths'][0]2034iflen(self.origin) ==0:2035 self.origin = upstream20362037iflen(self.update_shelve) >0:2038 self.shelve =True20392040if self.preserveUser:2041if not self.canChangeChangelists():2042die("Cannot preserve user names without p4 super-user or admin permissions")20432044# if not set from the command line, try the config file2045if self.conflict_behavior is None:2046 val =gitConfig("git-p4.conflict")2047if val:2048if val not in self.conflict_behavior_choices:2049die("Invalid value '%s' for config git-p4.conflict"% val)2050else:2051 val ="ask"2052 self.conflict_behavior = val20532054if self.verbose:2055print"Origin branch is "+ self.origin20562057iflen(self.depotPath) ==0:2058print"Internal error: cannot locate perforce depot path from existing branches"2059 sys.exit(128)20602061 self.useClientSpec =False2062ifgitConfigBool("git-p4.useclientspec"):2063 self.useClientSpec =True2064if self.useClientSpec:2065 self.clientSpecDirs =getClientSpec()20662067# Check for the existence of P4 branches2068 branchesDetected = (len(p4BranchesInGit().keys()) >1)20692070if self.useClientSpec and not branchesDetected:2071# all files are relative to the client spec2072 self.clientPath =getClientRoot()2073else:2074 self.clientPath =p4Where(self.depotPath)20752076if self.clientPath =="":2077die("Error: Cannot locate perforce checkout of%sin client view"% self.depotPath)20782079print"Perforce checkout for depot path%slocated at%s"% (self.depotPath, self.clientPath)2080 self.oldWorkingDirectory = os.getcwd()20812082# ensure the clientPath exists2083 new_client_dir =False2084if not os.path.exists(self.clientPath):2085 new_client_dir =True2086 os.makedirs(self.clientPath)20872088chdir(self.clientPath, is_client_path=True)2089if self.dry_run:2090print"Would synchronize p4 checkout in%s"% self.clientPath2091else:2092print"Synchronizing p4 checkout..."2093if new_client_dir:2094# old one was destroyed, and maybe nobody told p42095p4_sync("...","-f")2096else:2097p4_sync("...")2098 self.check()20992100 commits = []2101if self.master:2102 committish = self.master2103else:2104 committish ='HEAD'21052106for line inread_pipe_lines(["git","rev-list","--no-merges","%s..%s"% (self.origin, committish)]):2107 commits.append(line.strip())2108 commits.reverse()21092110if self.preserveUser orgitConfigBool("git-p4.skipUserNameCheck"):2111 self.checkAuthorship =False2112else:2113 self.checkAuthorship =True21142115if self.preserveUser:2116 self.checkValidP4Users(commits)21172118#2119# Build up a set of options to be passed to diff when2120# submitting each commit to p4.2121#2122if self.detectRenames:2123# command-line -M arg2124 self.diffOpts ="-M"2125else:2126# If not explicitly set check the config variable2127 detectRenames =gitConfig("git-p4.detectRenames")21282129if detectRenames.lower() =="false"or detectRenames =="":2130 self.diffOpts =""2131elif detectRenames.lower() =="true":2132 self.diffOpts ="-M"2133else:2134 self.diffOpts ="-M%s"% detectRenames21352136# no command-line arg for -C or --find-copies-harder, just2137# config variables2138 detectCopies =gitConfig("git-p4.detectCopies")2139if detectCopies.lower() =="false"or detectCopies =="":2140pass2141elif detectCopies.lower() =="true":2142 self.diffOpts +=" -C"2143else:2144 self.diffOpts +=" -C%s"% detectCopies21452146ifgitConfigBool("git-p4.detectCopiesHarder"):2147 self.diffOpts +=" --find-copies-harder"21482149 num_shelves =len(self.update_shelve)2150if num_shelves >0and num_shelves !=len(commits):2151 sys.exit("number of commits (%d) must match number of shelved changelist (%d)"%2152(len(commits), num_shelves))21532154#2155# Apply the commits, one at a time. On failure, ask if should2156# continue to try the rest of the patches, or quit.2157#2158if self.dry_run:2159print"Would apply"2160 applied = []2161 last =len(commits) -12162for i, commit inenumerate(commits):2163if self.dry_run:2164print" ",read_pipe(["git","show","-s",2165"--format=format:%h%s", commit])2166 ok =True2167else:2168 ok = self.applyCommit(commit)2169if ok:2170 applied.append(commit)2171else:2172if self.prepare_p4_only and i < last:2173print"Processing only the first commit due to option" \2174" --prepare-p4-only"2175break2176if i < last:2177 quit =False2178while True:2179# prompt for what to do, or use the option/variable2180if self.conflict_behavior =="ask":2181print"What do you want to do?"2182 response =raw_input("[s]kip this commit but apply"2183" the rest, or [q]uit? ")2184if not response:2185continue2186elif self.conflict_behavior =="skip":2187 response ="s"2188elif self.conflict_behavior =="quit":2189 response ="q"2190else:2191die("Unknown conflict_behavior '%s'"%2192 self.conflict_behavior)21932194if response[0] =="s":2195print"Skipping this commit, but applying the rest"2196break2197if response[0] =="q":2198print"Quitting"2199 quit =True2200break2201if quit:2202break22032204chdir(self.oldWorkingDirectory)2205 shelved_applied ="shelved"if self.shelve else"applied"2206if self.dry_run:2207pass2208elif self.prepare_p4_only:2209pass2210eliflen(commits) ==len(applied):2211print("All commits{0}!".format(shelved_applied))22122213 sync =P4Sync()2214if self.branch:2215 sync.branch = self.branch2216 sync.run([])22172218 rebase =P4Rebase()2219 rebase.rebase()22202221else:2222iflen(applied) ==0:2223print("No commits{0}.".format(shelved_applied))2224else:2225print("{0}only the commits marked with '*':".format(shelved_applied.capitalize()))2226for c in commits:2227if c in applied:2228 star ="*"2229else:2230 star =" "2231print star,read_pipe(["git","show","-s",2232"--format=format:%h%s", c])2233print"You will have to do 'git p4 sync' and rebase."22342235ifgitConfigBool("git-p4.exportLabels"):2236 self.exportLabels =True22372238if self.exportLabels:2239 p4Labels =getP4Labels(self.depotPath)2240 gitTags =getGitTags()22412242 missingGitTags = gitTags - p4Labels2243 self.exportGitTags(missingGitTags)22442245# exit with error unless everything applied perfectly2246iflen(commits) !=len(applied):2247 sys.exit(1)22482249return True22502251classView(object):2252"""Represent a p4 view ("p4 help views"), and map files in a2253 repo according to the view."""22542255def__init__(self, client_name):2256 self.mappings = []2257 self.client_prefix ="//%s/"% client_name2258# cache results of "p4 where" to lookup client file locations2259 self.client_spec_path_cache = {}22602261defappend(self, view_line):2262"""Parse a view line, splitting it into depot and client2263 sides. Append to self.mappings, preserving order. This2264 is only needed for tag creation."""22652266# Split the view line into exactly two words. P4 enforces2267# structure on these lines that simplifies this quite a bit.2268#2269# Either or both words may be double-quoted.2270# Single quotes do not matter.2271# Double-quote marks cannot occur inside the words.2272# A + or - prefix is also inside the quotes.2273# There are no quotes unless they contain a space.2274# The line is already white-space stripped.2275# The two words are separated by a single space.2276#2277if view_line[0] =='"':2278# First word is double quoted. Find its end.2279 close_quote_index = view_line.find('"',1)2280if close_quote_index <=0:2281die("No first-word closing quote found:%s"% view_line)2282 depot_side = view_line[1:close_quote_index]2283# skip closing quote and space2284 rhs_index = close_quote_index +1+12285else:2286 space_index = view_line.find(" ")2287if space_index <=0:2288die("No word-splitting space found:%s"% view_line)2289 depot_side = view_line[0:space_index]2290 rhs_index = space_index +122912292# prefix + means overlay on previous mapping2293if depot_side.startswith("+"):2294 depot_side = depot_side[1:]22952296# prefix - means exclude this path, leave out of mappings2297 exclude =False2298if depot_side.startswith("-"):2299 exclude =True2300 depot_side = depot_side[1:]23012302if not exclude:2303 self.mappings.append(depot_side)23042305defconvert_client_path(self, clientFile):2306# chop off //client/ part to make it relative2307if not clientFile.startswith(self.client_prefix):2308die("No prefix '%s' on clientFile '%s'"%2309(self.client_prefix, clientFile))2310return clientFile[len(self.client_prefix):]23112312defupdate_client_spec_path_cache(self, files):2313""" Caching file paths by "p4 where" batch query """23142315# List depot file paths exclude that already cached2316 fileArgs = [f['path']for f in files if f['path']not in self.client_spec_path_cache]23172318iflen(fileArgs) ==0:2319return# All files in cache23202321 where_result =p4CmdList(["-x","-","where"], stdin=fileArgs)2322for res in where_result:2323if"code"in res and res["code"] =="error":2324# assume error is "... file(s) not in client view"2325continue2326if"clientFile"not in res:2327die("No clientFile in 'p4 where' output")2328if"unmap"in res:2329# it will list all of them, but only one not unmap-ped2330continue2331ifgitConfigBool("core.ignorecase"):2332 res['depotFile'] = res['depotFile'].lower()2333 self.client_spec_path_cache[res['depotFile']] = self.convert_client_path(res["clientFile"])23342335# not found files or unmap files set to ""2336for depotFile in fileArgs:2337ifgitConfigBool("core.ignorecase"):2338 depotFile = depotFile.lower()2339if depotFile not in self.client_spec_path_cache:2340 self.client_spec_path_cache[depotFile] =""23412342defmap_in_client(self, depot_path):2343"""Return the relative location in the client where this2344 depot file should live. Returns "" if the file should2345 not be mapped in the client."""23462347ifgitConfigBool("core.ignorecase"):2348 depot_path = depot_path.lower()23492350if depot_path in self.client_spec_path_cache:2351return self.client_spec_path_cache[depot_path]23522353die("Error:%sis not found in client spec path"% depot_path )2354return""23552356classP4Sync(Command, P4UserMap):2357 delete_actions = ("delete","move/delete","purge")23582359def__init__(self):2360 Command.__init__(self)2361 P4UserMap.__init__(self)2362 self.options = [2363 optparse.make_option("--branch", dest="branch"),2364 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),2365 optparse.make_option("--changesfile", dest="changesFile"),2366 optparse.make_option("--silent", dest="silent", action="store_true"),2367 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),2368 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),2369 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",2370help="Import into refs/heads/ , not refs/remotes"),2371 optparse.make_option("--max-changes", dest="maxChanges",2372help="Maximum number of changes to import"),2373 optparse.make_option("--changes-block-size", dest="changes_block_size",type="int",2374help="Internal block size to use when iteratively calling p4 changes"),2375 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',2376help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),2377 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',2378help="Only sync files that are included in the Perforce Client Spec"),2379 optparse.make_option("-/", dest="cloneExclude",2380 action="append",type="string",2381help="exclude depot path"),2382]2383 self.description ="""Imports from Perforce into a git repository.\n2384 example:2385 //depot/my/project/ -- to import the current head2386 //depot/my/project/@all -- to import everything2387 //depot/my/project/@1,6 -- to import only from revision 1 to 623882389 (a ... is not needed in the path p4 specification, it's added implicitly)"""23902391 self.usage +=" //depot/path[@revRange]"2392 self.silent =False2393 self.createdBranches =set()2394 self.committedChanges =set()2395 self.branch =""2396 self.detectBranches =False2397 self.detectLabels =False2398 self.importLabels =False2399 self.changesFile =""2400 self.syncWithOrigin =True2401 self.importIntoRemotes =True2402 self.maxChanges =""2403 self.changes_block_size =None2404 self.keepRepoPath =False2405 self.depotPaths =None2406 self.p4BranchesInGit = []2407 self.cloneExclude = []2408 self.useClientSpec =False2409 self.useClientSpec_from_options =False2410 self.clientSpecDirs =None2411 self.tempBranches = []2412 self.tempBranchLocation ="refs/git-p4-tmp"2413 self.largeFileSystem =None24142415ifgitConfig('git-p4.largeFileSystem'):2416 largeFileSystemConstructor =globals()[gitConfig('git-p4.largeFileSystem')]2417 self.largeFileSystem =largeFileSystemConstructor(2418lambda git_mode, relPath, contents: self.writeToGitStream(git_mode, relPath, contents)2419)24202421ifgitConfig("git-p4.syncFromOrigin") =="false":2422 self.syncWithOrigin =False24232424# Force a checkpoint in fast-import and wait for it to finish2425defcheckpoint(self):2426 self.gitStream.write("checkpoint\n\n")2427 self.gitStream.write("progress checkpoint\n\n")2428 out = self.gitOutput.readline()2429if self.verbose:2430print"checkpoint finished: "+ out24312432defextractFilesFromCommit(self, commit):2433 self.cloneExclude = [re.sub(r"\.\.\.$","", path)2434for path in self.cloneExclude]2435 files = []2436 fnum =02437while commit.has_key("depotFile%s"% fnum):2438 path = commit["depotFile%s"% fnum]24392440if[p for p in self.cloneExclude2441ifp4PathStartsWith(path, p)]:2442 found =False2443else:2444 found = [p for p in self.depotPaths2445ifp4PathStartsWith(path, p)]2446if not found:2447 fnum = fnum +12448continue24492450file= {}2451file["path"] = path2452file["rev"] = commit["rev%s"% fnum]2453file["action"] = commit["action%s"% fnum]2454file["type"] = commit["type%s"% fnum]2455 files.append(file)2456 fnum = fnum +12457return files24582459defextractJobsFromCommit(self, commit):2460 jobs = []2461 jnum =02462while commit.has_key("job%s"% jnum):2463 job = commit["job%s"% jnum]2464 jobs.append(job)2465 jnum = jnum +12466return jobs24672468defstripRepoPath(self, path, prefixes):2469"""When streaming files, this is called to map a p4 depot path2470 to where it should go in git. The prefixes are either2471 self.depotPaths, or self.branchPrefixes in the case of2472 branch detection."""24732474if self.useClientSpec:2475# branch detection moves files up a level (the branch name)2476# from what client spec interpretation gives2477 path = self.clientSpecDirs.map_in_client(path)2478if self.detectBranches:2479for b in self.knownBranches:2480if path.startswith(b +"/"):2481 path = path[len(b)+1:]24822483elif self.keepRepoPath:2484# Preserve everything in relative path name except leading2485# //depot/; just look at first prefix as they all should2486# be in the same depot.2487 depot = re.sub("^(//[^/]+/).*", r'\1', prefixes[0])2488ifp4PathStartsWith(path, depot):2489 path = path[len(depot):]24902491else:2492for p in prefixes:2493ifp4PathStartsWith(path, p):2494 path = path[len(p):]2495break24962497 path =wildcard_decode(path)2498return path24992500defsplitFilesIntoBranches(self, commit):2501"""Look at each depotFile in the commit to figure out to what2502 branch it belongs."""25032504if self.clientSpecDirs:2505 files = self.extractFilesFromCommit(commit)2506 self.clientSpecDirs.update_client_spec_path_cache(files)25072508 branches = {}2509 fnum =02510while commit.has_key("depotFile%s"% fnum):2511 path = commit["depotFile%s"% fnum]2512 found = [p for p in self.depotPaths2513ifp4PathStartsWith(path, p)]2514if not found:2515 fnum = fnum +12516continue25172518file= {}2519file["path"] = path2520file["rev"] = commit["rev%s"% fnum]2521file["action"] = commit["action%s"% fnum]2522file["type"] = commit["type%s"% fnum]2523 fnum = fnum +125242525# start with the full relative path where this file would2526# go in a p4 client2527if self.useClientSpec:2528 relPath = self.clientSpecDirs.map_in_client(path)2529else:2530 relPath = self.stripRepoPath(path, self.depotPaths)25312532for branch in self.knownBranches.keys():2533# add a trailing slash so that a commit into qt/4.2foo2534# doesn't end up in qt/4.2, e.g.2535if relPath.startswith(branch +"/"):2536if branch not in branches:2537 branches[branch] = []2538 branches[branch].append(file)2539break25402541return branches25422543defwriteToGitStream(self, gitMode, relPath, contents):2544 self.gitStream.write('M%sinline%s\n'% (gitMode, relPath))2545 self.gitStream.write('data%d\n'%sum(len(d)for d in contents))2546for d in contents:2547 self.gitStream.write(d)2548 self.gitStream.write('\n')25492550defencodeWithUTF8(self, path):2551try:2552 path.decode('ascii')2553except:2554 encoding ='utf8'2555ifgitConfig('git-p4.pathEncoding'):2556 encoding =gitConfig('git-p4.pathEncoding')2557 path = path.decode(encoding,'replace').encode('utf8','replace')2558if self.verbose:2559print'Path with non-ASCII characters detected. Used%sto encode:%s'% (encoding, path)2560return path25612562# output one file from the P4 stream2563# - helper for streamP4Files25642565defstreamOneP4File(self,file, contents):2566 relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)2567 relPath = self.encodeWithUTF8(relPath)2568if verbose:2569 size =int(self.stream_file['fileSize'])2570 sys.stdout.write('\r%s-->%s(%iMB)\n'% (file['depotFile'], relPath, size/1024/1024))2571 sys.stdout.flush()25722573(type_base, type_mods) =split_p4_type(file["type"])25742575 git_mode ="100644"2576if"x"in type_mods:2577 git_mode ="100755"2578if type_base =="symlink":2579 git_mode ="120000"2580# p4 print on a symlink sometimes contains "target\n";2581# if it does, remove the newline2582 data =''.join(contents)2583if not data:2584# Some version of p4 allowed creating a symlink that pointed2585# to nothing. This causes p4 errors when checking out such2586# a change, and errors here too. Work around it by ignoring2587# the bad symlink; hopefully a future change fixes it.2588print"\nIgnoring empty symlink in%s"%file['depotFile']2589return2590elif data[-1] =='\n':2591 contents = [data[:-1]]2592else:2593 contents = [data]25942595if type_base =="utf16":2596# p4 delivers different text in the python output to -G2597# than it does when using "print -o", or normal p4 client2598# operations. utf16 is converted to ascii or utf8, perhaps.2599# But ascii text saved as -t utf16 is completely mangled.2600# Invoke print -o to get the real contents.2601#2602# On windows, the newlines will always be mangled by print, so put2603# them back too. This is not needed to the cygwin windows version,2604# just the native "NT" type.2605#2606try:2607 text =p4_read_pipe(['print','-q','-o','-','%s@%s'% (file['depotFile'],file['change'])])2608exceptExceptionas e:2609if'Translation of file content failed'instr(e):2610 type_base ='binary'2611else:2612raise e2613else:2614ifp4_version_string().find('/NT') >=0:2615 text = text.replace('\r\n','\n')2616 contents = [ text ]26172618if type_base =="apple":2619# Apple filetype files will be streamed as a concatenation of2620# its appledouble header and the contents. This is useless2621# on both macs and non-macs. If using "print -q -o xx", it2622# will create "xx" with the data, and "%xx" with the header.2623# This is also not very useful.2624#2625# Ideally, someday, this script can learn how to generate2626# appledouble files directly and import those to git, but2627# non-mac machines can never find a use for apple filetype.2628print"\nIgnoring apple filetype file%s"%file['depotFile']2629return26302631# Note that we do not try to de-mangle keywords on utf16 files,2632# even though in theory somebody may want that.2633 pattern =p4_keywords_regexp_for_type(type_base, type_mods)2634if pattern:2635 regexp = re.compile(pattern, re.VERBOSE)2636 text =''.join(contents)2637 text = regexp.sub(r'$\1$', text)2638 contents = [ text ]26392640if self.largeFileSystem:2641(git_mode, contents) = self.largeFileSystem.processContent(git_mode, relPath, contents)26422643 self.writeToGitStream(git_mode, relPath, contents)26442645defstreamOneP4Deletion(self,file):2646 relPath = self.stripRepoPath(file['path'], self.branchPrefixes)2647 relPath = self.encodeWithUTF8(relPath)2648if verbose:2649 sys.stdout.write("delete%s\n"% relPath)2650 sys.stdout.flush()2651 self.gitStream.write("D%s\n"% relPath)26522653if self.largeFileSystem and self.largeFileSystem.isLargeFile(relPath):2654 self.largeFileSystem.removeLargeFile(relPath)26552656# handle another chunk of streaming data2657defstreamP4FilesCb(self, marshalled):26582659# catch p4 errors and complain2660 err =None2661if"code"in marshalled:2662if marshalled["code"] =="error":2663if"data"in marshalled:2664 err = marshalled["data"].rstrip()26652666if not err and'fileSize'in self.stream_file:2667 required_bytes =int((4*int(self.stream_file["fileSize"])) -calcDiskFree())2668if required_bytes >0:2669 err ='Not enough space left on%s! Free at least%iMB.'% (2670 os.getcwd(), required_bytes/1024/10242671)26722673if err:2674 f =None2675if self.stream_have_file_info:2676if"depotFile"in self.stream_file:2677 f = self.stream_file["depotFile"]2678# force a failure in fast-import, else an empty2679# commit will be made2680 self.gitStream.write("\n")2681 self.gitStream.write("die-now\n")2682 self.gitStream.close()2683# ignore errors, but make sure it exits first2684 self.importProcess.wait()2685if f:2686die("Error from p4 print for%s:%s"% (f, err))2687else:2688die("Error from p4 print:%s"% err)26892690if marshalled.has_key('depotFile')and self.stream_have_file_info:2691# start of a new file - output the old one first2692 self.streamOneP4File(self.stream_file, self.stream_contents)2693 self.stream_file = {}2694 self.stream_contents = []2695 self.stream_have_file_info =False26962697# pick up the new file information... for the2698# 'data' field we need to append to our array2699for k in marshalled.keys():2700if k =='data':2701if'streamContentSize'not in self.stream_file:2702 self.stream_file['streamContentSize'] =02703 self.stream_file['streamContentSize'] +=len(marshalled['data'])2704 self.stream_contents.append(marshalled['data'])2705else:2706 self.stream_file[k] = marshalled[k]27072708if(verbose and2709'streamContentSize'in self.stream_file and2710'fileSize'in self.stream_file and2711'depotFile'in self.stream_file):2712 size =int(self.stream_file["fileSize"])2713if size >0:2714 progress =100*self.stream_file['streamContentSize']/size2715 sys.stdout.write('\r%s %d%%(%iMB)'% (self.stream_file['depotFile'], progress,int(size/1024/1024)))2716 sys.stdout.flush()27172718 self.stream_have_file_info =True27192720# Stream directly from "p4 files" into "git fast-import"2721defstreamP4Files(self, files):2722 filesForCommit = []2723 filesToRead = []2724 filesToDelete = []27252726for f in files:2727 filesForCommit.append(f)2728if f['action']in self.delete_actions:2729 filesToDelete.append(f)2730else:2731 filesToRead.append(f)27322733# deleted files...2734for f in filesToDelete:2735 self.streamOneP4Deletion(f)27362737iflen(filesToRead) >0:2738 self.stream_file = {}2739 self.stream_contents = []2740 self.stream_have_file_info =False27412742# curry self argument2743defstreamP4FilesCbSelf(entry):2744 self.streamP4FilesCb(entry)27452746 fileArgs = ['%s#%s'% (f['path'], f['rev'])for f in filesToRead]27472748p4CmdList(["-x","-","print"],2749 stdin=fileArgs,2750 cb=streamP4FilesCbSelf)27512752# do the last chunk2753if self.stream_file.has_key('depotFile'):2754 self.streamOneP4File(self.stream_file, self.stream_contents)27552756defmake_email(self, userid):2757if userid in self.users:2758return self.users[userid]2759else:2760return"%s<a@b>"% userid27612762defstreamTag(self, gitStream, labelName, labelDetails, commit, epoch):2763""" Stream a p4 tag.2764 commit is either a git commit, or a fast-import mark, ":<p4commit>"2765 """27662767if verbose:2768print"writing tag%sfor commit%s"% (labelName, commit)2769 gitStream.write("tag%s\n"% labelName)2770 gitStream.write("from%s\n"% commit)27712772if labelDetails.has_key('Owner'):2773 owner = labelDetails["Owner"]2774else:2775 owner =None27762777# Try to use the owner of the p4 label, or failing that,2778# the current p4 user id.2779if owner:2780 email = self.make_email(owner)2781else:2782 email = self.make_email(self.p4UserId())2783 tagger ="%s %s %s"% (email, epoch, self.tz)27842785 gitStream.write("tagger%s\n"% tagger)27862787print"labelDetails=",labelDetails2788if labelDetails.has_key('Description'):2789 description = labelDetails['Description']2790else:2791 description ='Label from git p4'27922793 gitStream.write("data%d\n"%len(description))2794 gitStream.write(description)2795 gitStream.write("\n")27962797definClientSpec(self, path):2798if not self.clientSpecDirs:2799return True2800 inClientSpec = self.clientSpecDirs.map_in_client(path)2801if not inClientSpec and self.verbose:2802print('Ignoring file outside of client spec:{0}'.format(path))2803return inClientSpec28042805defhasBranchPrefix(self, path):2806if not self.branchPrefixes:2807return True2808 hasPrefix = [p for p in self.branchPrefixes2809ifp4PathStartsWith(path, p)]2810if not hasPrefix and self.verbose:2811print('Ignoring file outside of prefix:{0}'.format(path))2812return hasPrefix28132814defcommit(self, details, files, branch, parent =""):2815 epoch = details["time"]2816 author = details["user"]2817 jobs = self.extractJobsFromCommit(details)28182819if self.verbose:2820print('commit into{0}'.format(branch))28212822if self.clientSpecDirs:2823 self.clientSpecDirs.update_client_spec_path_cache(files)28242825 files = [f for f in files2826if self.inClientSpec(f['path'])and self.hasBranchPrefix(f['path'])]28272828if not files and notgitConfigBool('git-p4.keepEmptyCommits'):2829print('Ignoring revision{0}as it would produce an empty commit.'2830.format(details['change']))2831return28322833 self.gitStream.write("commit%s\n"% branch)2834 self.gitStream.write("mark :%s\n"% details["change"])2835 self.committedChanges.add(int(details["change"]))2836 committer =""2837if author not in self.users:2838 self.getUserMapFromPerforceServer()2839 committer ="%s %s %s"% (self.make_email(author), epoch, self.tz)28402841 self.gitStream.write("committer%s\n"% committer)28422843 self.gitStream.write("data <<EOT\n")2844 self.gitStream.write(details["desc"])2845iflen(jobs) >0:2846 self.gitStream.write("\nJobs:%s"% (' '.join(jobs)))2847 self.gitStream.write("\n[git-p4: depot-paths =\"%s\": change =%s"%2848(','.join(self.branchPrefixes), details["change"]))2849iflen(details['options']) >0:2850 self.gitStream.write(": options =%s"% details['options'])2851 self.gitStream.write("]\nEOT\n\n")28522853iflen(parent) >0:2854if self.verbose:2855print"parent%s"% parent2856 self.gitStream.write("from%s\n"% parent)28572858 self.streamP4Files(files)2859 self.gitStream.write("\n")28602861 change =int(details["change"])28622863if self.labels.has_key(change):2864 label = self.labels[change]2865 labelDetails = label[0]2866 labelRevisions = label[1]2867if self.verbose:2868print"Change%sis labelled%s"% (change, labelDetails)28692870 files =p4CmdList(["files"] + ["%s...@%s"% (p, change)2871for p in self.branchPrefixes])28722873iflen(files) ==len(labelRevisions):28742875 cleanedFiles = {}2876for info in files:2877if info["action"]in self.delete_actions:2878continue2879 cleanedFiles[info["depotFile"]] = info["rev"]28802881if cleanedFiles == labelRevisions:2882 self.streamTag(self.gitStream,'tag_%s'% labelDetails['label'], labelDetails, branch, epoch)28832884else:2885if not self.silent:2886print("Tag%sdoes not match with change%s: files do not match."2887% (labelDetails["label"], change))28882889else:2890if not self.silent:2891print("Tag%sdoes not match with change%s: file count is different."2892% (labelDetails["label"], change))28932894# Build a dictionary of changelists and labels, for "detect-labels" option.2895defgetLabels(self):2896 self.labels = {}28972898 l =p4CmdList(["labels"] + ["%s..."% p for p in self.depotPaths])2899iflen(l) >0and not self.silent:2900print"Finding files belonging to labels in%s"% `self.depotPaths`29012902for output in l:2903 label = output["label"]2904 revisions = {}2905 newestChange =02906if self.verbose:2907print"Querying files for label%s"% label2908forfileinp4CmdList(["files"] +2909["%s...@%s"% (p, label)2910for p in self.depotPaths]):2911 revisions[file["depotFile"]] =file["rev"]2912 change =int(file["change"])2913if change > newestChange:2914 newestChange = change29152916 self.labels[newestChange] = [output, revisions]29172918if self.verbose:2919print"Label changes:%s"% self.labels.keys()29202921# Import p4 labels as git tags. A direct mapping does not2922# exist, so assume that if all the files are at the same revision2923# then we can use that, or it's something more complicated we should2924# just ignore.2925defimportP4Labels(self, stream, p4Labels):2926if verbose:2927print"import p4 labels: "+' '.join(p4Labels)29282929 ignoredP4Labels =gitConfigList("git-p4.ignoredP4Labels")2930 validLabelRegexp =gitConfig("git-p4.labelImportRegexp")2931iflen(validLabelRegexp) ==0:2932 validLabelRegexp = defaultLabelRegexp2933 m = re.compile(validLabelRegexp)29342935for name in p4Labels:2936 commitFound =False29372938if not m.match(name):2939if verbose:2940print"label%sdoes not match regexp%s"% (name,validLabelRegexp)2941continue29422943if name in ignoredP4Labels:2944continue29452946 labelDetails =p4CmdList(['label',"-o", name])[0]29472948# get the most recent changelist for each file in this label2949 change =p4Cmd(["changes","-m","1"] + ["%s...@%s"% (p, name)2950for p in self.depotPaths])29512952if change.has_key('change'):2953# find the corresponding git commit; take the oldest commit2954 changelist =int(change['change'])2955if changelist in self.committedChanges:2956 gitCommit =":%d"% changelist # use a fast-import mark2957 commitFound =True2958else:2959 gitCommit =read_pipe(["git","rev-list","--max-count=1",2960"--reverse",":/\[git-p4:.*change =%d\]"% changelist], ignore_error=True)2961iflen(gitCommit) ==0:2962print"importing label%s: could not find git commit for changelist%d"% (name, changelist)2963else:2964 commitFound =True2965 gitCommit = gitCommit.strip()29662967if commitFound:2968# Convert from p4 time format2969try:2970 tmwhen = time.strptime(labelDetails['Update'],"%Y/%m/%d%H:%M:%S")2971exceptValueError:2972print"Could not convert label time%s"% labelDetails['Update']2973 tmwhen =129742975 when =int(time.mktime(tmwhen))2976 self.streamTag(stream, name, labelDetails, gitCommit, when)2977if verbose:2978print"p4 label%smapped to git commit%s"% (name, gitCommit)2979else:2980if verbose:2981print"Label%shas no changelists - possibly deleted?"% name29822983if not commitFound:2984# We can't import this label; don't try again as it will get very2985# expensive repeatedly fetching all the files for labels that will2986# never be imported. If the label is moved in the future, the2987# ignore will need to be removed manually.2988system(["git","config","--add","git-p4.ignoredP4Labels", name])29892990defguessProjectName(self):2991for p in self.depotPaths:2992if p.endswith("/"):2993 p = p[:-1]2994 p = p[p.strip().rfind("/") +1:]2995if not p.endswith("/"):2996 p +="/"2997return p29982999defgetBranchMapping(self):3000 lostAndFoundBranches =set()30013002 user =gitConfig("git-p4.branchUser")3003iflen(user) >0:3004 command ="branches -u%s"% user3005else:3006 command ="branches"30073008for info inp4CmdList(command):3009 details =p4Cmd(["branch","-o", info["branch"]])3010 viewIdx =03011while details.has_key("View%s"% viewIdx):3012 paths = details["View%s"% viewIdx].split(" ")3013 viewIdx = viewIdx +13014# require standard //depot/foo/... //depot/bar/... mapping3015iflen(paths) !=2or not paths[0].endswith("/...")or not paths[1].endswith("/..."):3016continue3017 source = paths[0]3018 destination = paths[1]3019## HACK3020ifp4PathStartsWith(source, self.depotPaths[0])andp4PathStartsWith(destination, self.depotPaths[0]):3021 source = source[len(self.depotPaths[0]):-4]3022 destination = destination[len(self.depotPaths[0]):-4]30233024if destination in self.knownBranches:3025if not self.silent:3026print"p4 branch%sdefines a mapping from%sto%s"% (info["branch"], source, destination)3027print"but there exists another mapping from%sto%salready!"% (self.knownBranches[destination], destination)3028continue30293030 self.knownBranches[destination] = source30313032 lostAndFoundBranches.discard(destination)30333034if source not in self.knownBranches:3035 lostAndFoundBranches.add(source)30363037# Perforce does not strictly require branches to be defined, so we also3038# check git config for a branch list.3039#3040# Example of branch definition in git config file:3041# [git-p4]3042# branchList=main:branchA3043# branchList=main:branchB3044# branchList=branchA:branchC3045 configBranches =gitConfigList("git-p4.branchList")3046for branch in configBranches:3047if branch:3048(source, destination) = branch.split(":")3049 self.knownBranches[destination] = source30503051 lostAndFoundBranches.discard(destination)30523053if source not in self.knownBranches:3054 lostAndFoundBranches.add(source)305530563057for branch in lostAndFoundBranches:3058 self.knownBranches[branch] = branch30593060defgetBranchMappingFromGitBranches(self):3061 branches =p4BranchesInGit(self.importIntoRemotes)3062for branch in branches.keys():3063if branch =="master":3064 branch ="main"3065else:3066 branch = branch[len(self.projectName):]3067 self.knownBranches[branch] = branch30683069defupdateOptionDict(self, d):3070 option_keys = {}3071if self.keepRepoPath:3072 option_keys['keepRepoPath'] =130733074 d["options"] =' '.join(sorted(option_keys.keys()))30753076defreadOptions(self, d):3077 self.keepRepoPath = (d.has_key('options')3078and('keepRepoPath'in d['options']))30793080defgitRefForBranch(self, branch):3081if branch =="main":3082return self.refPrefix +"master"30833084iflen(branch) <=0:3085return branch30863087return self.refPrefix + self.projectName + branch30883089defgitCommitByP4Change(self, ref, change):3090if self.verbose:3091print"looking in ref "+ ref +" for change%susing bisect..."% change30923093 earliestCommit =""3094 latestCommit =parseRevision(ref)30953096while True:3097if self.verbose:3098print"trying: earliest%slatest%s"% (earliestCommit, latestCommit)3099 next =read_pipe("git rev-list --bisect%s %s"% (latestCommit, earliestCommit)).strip()3100iflen(next) ==0:3101if self.verbose:3102print"argh"3103return""3104 log =extractLogMessageFromGitCommit(next)3105 settings =extractSettingsGitLog(log)3106 currentChange =int(settings['change'])3107if self.verbose:3108print"current change%s"% currentChange31093110if currentChange == change:3111if self.verbose:3112print"found%s"% next3113return next31143115if currentChange < change:3116 earliestCommit ="^%s"% next3117else:3118 latestCommit ="%s"% next31193120return""31213122defimportNewBranch(self, branch, maxChange):3123# make fast-import flush all changes to disk and update the refs using the checkpoint3124# command so that we can try to find the branch parent in the git history3125 self.gitStream.write("checkpoint\n\n");3126 self.gitStream.flush();3127 branchPrefix = self.depotPaths[0] + branch +"/"3128range="@1,%s"% maxChange3129#print "prefix" + branchPrefix3130 changes =p4ChangesForPaths([branchPrefix],range, self.changes_block_size)3131iflen(changes) <=0:3132return False3133 firstChange = changes[0]3134#print "first change in branch: %s" % firstChange3135 sourceBranch = self.knownBranches[branch]3136 sourceDepotPath = self.depotPaths[0] + sourceBranch3137 sourceRef = self.gitRefForBranch(sourceBranch)3138#print "source " + sourceBranch31393140 branchParentChange =int(p4Cmd(["changes","-m","1","%s...@1,%s"% (sourceDepotPath, firstChange)])["change"])3141#print "branch parent: %s" % branchParentChange3142 gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)3143iflen(gitParent) >0:3144 self.initialParents[self.gitRefForBranch(branch)] = gitParent3145#print "parent git commit: %s" % gitParent31463147 self.importChanges(changes)3148return True31493150defsearchParent(self, parent, branch, target):3151 parentFound =False3152for blob inread_pipe_lines(["git","rev-list","--reverse",3153"--no-merges", parent]):3154 blob = blob.strip()3155iflen(read_pipe(["git","diff-tree", blob, target])) ==0:3156 parentFound =True3157if self.verbose:3158print"Found parent of%sin commit%s"% (branch, blob)3159break3160if parentFound:3161return blob3162else:3163return None31643165defimportChanges(self, changes):3166 cnt =13167for change in changes:3168 description =p4_describe(change)3169 self.updateOptionDict(description)31703171if not self.silent:3172 sys.stdout.write("\rImporting revision%s(%s%%)"% (change, cnt *100/len(changes)))3173 sys.stdout.flush()3174 cnt = cnt +131753176try:3177if self.detectBranches:3178 branches = self.splitFilesIntoBranches(description)3179for branch in branches.keys():3180## HACK --hwn3181 branchPrefix = self.depotPaths[0] + branch +"/"3182 self.branchPrefixes = [ branchPrefix ]31833184 parent =""31853186 filesForCommit = branches[branch]31873188if self.verbose:3189print"branch is%s"% branch31903191 self.updatedBranches.add(branch)31923193if branch not in self.createdBranches:3194 self.createdBranches.add(branch)3195 parent = self.knownBranches[branch]3196if parent == branch:3197 parent =""3198else:3199 fullBranch = self.projectName + branch3200if fullBranch not in self.p4BranchesInGit:3201if not self.silent:3202print("\nImporting new branch%s"% fullBranch);3203if self.importNewBranch(branch, change -1):3204 parent =""3205 self.p4BranchesInGit.append(fullBranch)3206if not self.silent:3207print("\nResuming with change%s"% change);32083209if self.verbose:3210print"parent determined through known branches:%s"% parent32113212 branch = self.gitRefForBranch(branch)3213 parent = self.gitRefForBranch(parent)32143215if self.verbose:3216print"looking for initial parent for%s; current parent is%s"% (branch, parent)32173218iflen(parent) ==0and branch in self.initialParents:3219 parent = self.initialParents[branch]3220del self.initialParents[branch]32213222 blob =None3223iflen(parent) >0:3224 tempBranch ="%s/%d"% (self.tempBranchLocation, change)3225if self.verbose:3226print"Creating temporary branch: "+ tempBranch3227 self.commit(description, filesForCommit, tempBranch)3228 self.tempBranches.append(tempBranch)3229 self.checkpoint()3230 blob = self.searchParent(parent, branch, tempBranch)3231if blob:3232 self.commit(description, filesForCommit, branch, blob)3233else:3234if self.verbose:3235print"Parent of%snot found. Committing into head of%s"% (branch, parent)3236 self.commit(description, filesForCommit, branch, parent)3237else:3238 files = self.extractFilesFromCommit(description)3239 self.commit(description, files, self.branch,3240 self.initialParent)3241# only needed once, to connect to the previous commit3242 self.initialParent =""3243exceptIOError:3244print self.gitError.read()3245 sys.exit(1)32463247defimportHeadRevision(self, revision):3248print"Doing initial import of%sfrom revision%sinto%s"% (' '.join(self.depotPaths), revision, self.branch)32493250 details = {}3251 details["user"] ="git perforce import user"3252 details["desc"] = ("Initial import of%sfrom the state at revision%s\n"3253% (' '.join(self.depotPaths), revision))3254 details["change"] = revision3255 newestRevision =032563257 fileCnt =03258 fileArgs = ["%s...%s"% (p,revision)for p in self.depotPaths]32593260for info inp4CmdList(["files"] + fileArgs):32613262if'code'in info and info['code'] =='error':3263 sys.stderr.write("p4 returned an error:%s\n"3264% info['data'])3265if info['data'].find("must refer to client") >=0:3266 sys.stderr.write("This particular p4 error is misleading.\n")3267 sys.stderr.write("Perhaps the depot path was misspelled.\n");3268 sys.stderr.write("Depot path:%s\n"%" ".join(self.depotPaths))3269 sys.exit(1)3270if'p4ExitCode'in info:3271 sys.stderr.write("p4 exitcode:%s\n"% info['p4ExitCode'])3272 sys.exit(1)327332743275 change =int(info["change"])3276if change > newestRevision:3277 newestRevision = change32783279if info["action"]in self.delete_actions:3280# don't increase the file cnt, otherwise details["depotFile123"] will have gaps!3281#fileCnt = fileCnt + 13282continue32833284for prop in["depotFile","rev","action","type"]:3285 details["%s%s"% (prop, fileCnt)] = info[prop]32863287 fileCnt = fileCnt +132883289 details["change"] = newestRevision32903291# Use time from top-most change so that all git p4 clones of3292# the same p4 repo have the same commit SHA1s.3293 res =p4_describe(newestRevision)3294 details["time"] = res["time"]32953296 self.updateOptionDict(details)3297try:3298 self.commit(details, self.extractFilesFromCommit(details), self.branch)3299exceptIOError:3300print"IO error with git fast-import. Is your git version recent enough?"3301print self.gitError.read()330233033304defrun(self, args):3305 self.depotPaths = []3306 self.changeRange =""3307 self.previousDepotPaths = []3308 self.hasOrigin =False33093310# map from branch depot path to parent branch3311 self.knownBranches = {}3312 self.initialParents = {}33133314if self.importIntoRemotes:3315 self.refPrefix ="refs/remotes/p4/"3316else:3317 self.refPrefix ="refs/heads/p4/"33183319if self.syncWithOrigin:3320 self.hasOrigin =originP4BranchesExist()3321if self.hasOrigin:3322if not self.silent:3323print'Syncing with origin first, using "git fetch origin"'3324system("git fetch origin")33253326 branch_arg_given =bool(self.branch)3327iflen(self.branch) ==0:3328 self.branch = self.refPrefix +"master"3329ifgitBranchExists("refs/heads/p4")and self.importIntoRemotes:3330system("git update-ref%srefs/heads/p4"% self.branch)3331system("git branch -D p4")33323333# accept either the command-line option, or the configuration variable3334if self.useClientSpec:3335# will use this after clone to set the variable3336 self.useClientSpec_from_options =True3337else:3338ifgitConfigBool("git-p4.useclientspec"):3339 self.useClientSpec =True3340if self.useClientSpec:3341 self.clientSpecDirs =getClientSpec()33423343# TODO: should always look at previous commits,3344# merge with previous imports, if possible.3345if args == []:3346if self.hasOrigin:3347createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)33483349# branches holds mapping from branch name to sha13350 branches =p4BranchesInGit(self.importIntoRemotes)33513352# restrict to just this one, disabling detect-branches3353if branch_arg_given:3354 short = self.branch.split("/")[-1]3355if short in branches:3356 self.p4BranchesInGit = [ short ]3357else:3358 self.p4BranchesInGit = branches.keys()33593360iflen(self.p4BranchesInGit) >1:3361if not self.silent:3362print"Importing from/into multiple branches"3363 self.detectBranches =True3364for branch in branches.keys():3365 self.initialParents[self.refPrefix + branch] = \3366 branches[branch]33673368if self.verbose:3369print"branches:%s"% self.p4BranchesInGit33703371 p4Change =03372for branch in self.p4BranchesInGit:3373 logMsg =extractLogMessageFromGitCommit(self.refPrefix + branch)33743375 settings =extractSettingsGitLog(logMsg)33763377 self.readOptions(settings)3378if(settings.has_key('depot-paths')3379and settings.has_key('change')):3380 change =int(settings['change']) +13381 p4Change =max(p4Change, change)33823383 depotPaths =sorted(settings['depot-paths'])3384if self.previousDepotPaths == []:3385 self.previousDepotPaths = depotPaths3386else:3387 paths = []3388for(prev, cur)inzip(self.previousDepotPaths, depotPaths):3389 prev_list = prev.split("/")3390 cur_list = cur.split("/")3391for i inrange(0,min(len(cur_list),len(prev_list))):3392if cur_list[i] <> prev_list[i]:3393 i = i -13394break33953396 paths.append("/".join(cur_list[:i +1]))33973398 self.previousDepotPaths = paths33993400if p4Change >0:3401 self.depotPaths =sorted(self.previousDepotPaths)3402 self.changeRange ="@%s,#head"% p4Change3403if not self.silent and not self.detectBranches:3404print"Performing incremental import into%sgit branch"% self.branch34053406# accept multiple ref name abbreviations:3407# refs/foo/bar/branch -> use it exactly3408# p4/branch -> prepend refs/remotes/ or refs/heads/3409# branch -> prepend refs/remotes/p4/ or refs/heads/p4/3410if not self.branch.startswith("refs/"):3411if self.importIntoRemotes:3412 prepend ="refs/remotes/"3413else:3414 prepend ="refs/heads/"3415if not self.branch.startswith("p4/"):3416 prepend +="p4/"3417 self.branch = prepend + self.branch34183419iflen(args) ==0and self.depotPaths:3420if not self.silent:3421print"Depot paths:%s"%' '.join(self.depotPaths)3422else:3423if self.depotPaths and self.depotPaths != args:3424print("previous import used depot path%sand now%swas specified. "3425"This doesn't work!"% (' '.join(self.depotPaths),3426' '.join(args)))3427 sys.exit(1)34283429 self.depotPaths =sorted(args)34303431 revision =""3432 self.users = {}34333434# Make sure no revision specifiers are used when --changesfile3435# is specified.3436 bad_changesfile =False3437iflen(self.changesFile) >0:3438for p in self.depotPaths:3439if p.find("@") >=0or p.find("#") >=0:3440 bad_changesfile =True3441break3442if bad_changesfile:3443die("Option --changesfile is incompatible with revision specifiers")34443445 newPaths = []3446for p in self.depotPaths:3447if p.find("@") != -1:3448 atIdx = p.index("@")3449 self.changeRange = p[atIdx:]3450if self.changeRange =="@all":3451 self.changeRange =""3452elif','not in self.changeRange:3453 revision = self.changeRange3454 self.changeRange =""3455 p = p[:atIdx]3456elif p.find("#") != -1:3457 hashIdx = p.index("#")3458 revision = p[hashIdx:]3459 p = p[:hashIdx]3460elif self.previousDepotPaths == []:3461# pay attention to changesfile, if given, else import3462# the entire p4 tree at the head revision3463iflen(self.changesFile) ==0:3464 revision ="#head"34653466 p = re.sub("\.\.\.$","", p)3467if not p.endswith("/"):3468 p +="/"34693470 newPaths.append(p)34713472 self.depotPaths = newPaths34733474# --detect-branches may change this for each branch3475 self.branchPrefixes = self.depotPaths34763477 self.loadUserMapFromCache()3478 self.labels = {}3479if self.detectLabels:3480 self.getLabels();34813482if self.detectBranches:3483## FIXME - what's a P4 projectName ?3484 self.projectName = self.guessProjectName()34853486if self.hasOrigin:3487 self.getBranchMappingFromGitBranches()3488else:3489 self.getBranchMapping()3490if self.verbose:3491print"p4-git branches:%s"% self.p4BranchesInGit3492print"initial parents:%s"% self.initialParents3493for b in self.p4BranchesInGit:3494if b !="master":34953496## FIXME3497 b = b[len(self.projectName):]3498 self.createdBranches.add(b)34993500 self.tz ="%+03d%02d"% (- time.timezone /3600, ((- time.timezone %3600) /60))35013502 self.importProcess = subprocess.Popen(["git","fast-import"],3503 stdin=subprocess.PIPE,3504 stdout=subprocess.PIPE,3505 stderr=subprocess.PIPE);3506 self.gitOutput = self.importProcess.stdout3507 self.gitStream = self.importProcess.stdin3508 self.gitError = self.importProcess.stderr35093510if revision:3511 self.importHeadRevision(revision)3512else:3513 changes = []35143515iflen(self.changesFile) >0:3516 output =open(self.changesFile).readlines()3517 changeSet =set()3518for line in output:3519 changeSet.add(int(line))35203521for change in changeSet:3522 changes.append(change)35233524 changes.sort()3525else:3526# catch "git p4 sync" with no new branches, in a repo that3527# does not have any existing p4 branches3528iflen(args) ==0:3529if not self.p4BranchesInGit:3530die("No remote p4 branches. Perhaps you never did\"git p4 clone\"in here.")35313532# The default branch is master, unless --branch is used to3533# specify something else. Make sure it exists, or complain3534# nicely about how to use --branch.3535if not self.detectBranches:3536if notbranch_exists(self.branch):3537if branch_arg_given:3538die("Error: branch%sdoes not exist."% self.branch)3539else:3540die("Error: no branch%s; perhaps specify one with --branch."%3541 self.branch)35423543if self.verbose:3544print"Getting p4 changes for%s...%s"% (', '.join(self.depotPaths),3545 self.changeRange)3546 changes =p4ChangesForPaths(self.depotPaths, self.changeRange, self.changes_block_size)35473548iflen(self.maxChanges) >0:3549 changes = changes[:min(int(self.maxChanges),len(changes))]35503551iflen(changes) ==0:3552if not self.silent:3553print"No changes to import!"3554else:3555if not self.silent and not self.detectBranches:3556print"Import destination:%s"% self.branch35573558 self.updatedBranches =set()35593560if not self.detectBranches:3561if args:3562# start a new branch3563 self.initialParent =""3564else:3565# build on a previous revision3566 self.initialParent =parseRevision(self.branch)35673568 self.importChanges(changes)35693570if not self.silent:3571print""3572iflen(self.updatedBranches) >0:3573 sys.stdout.write("Updated branches: ")3574for b in self.updatedBranches:3575 sys.stdout.write("%s"% b)3576 sys.stdout.write("\n")35773578ifgitConfigBool("git-p4.importLabels"):3579 self.importLabels =True35803581if self.importLabels:3582 p4Labels =getP4Labels(self.depotPaths)3583 gitTags =getGitTags()35843585 missingP4Labels = p4Labels - gitTags3586 self.importP4Labels(self.gitStream, missingP4Labels)35873588 self.gitStream.close()3589if self.importProcess.wait() !=0:3590die("fast-import failed:%s"% self.gitError.read())3591 self.gitOutput.close()3592 self.gitError.close()35933594# Cleanup temporary branches created during import3595if self.tempBranches != []:3596for branch in self.tempBranches:3597read_pipe("git update-ref -d%s"% branch)3598 os.rmdir(os.path.join(os.environ.get("GIT_DIR",".git"), self.tempBranchLocation))35993600# Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow3601# a convenient shortcut refname "p4".3602if self.importIntoRemotes:3603 head_ref = self.refPrefix +"HEAD"3604if notgitBranchExists(head_ref)andgitBranchExists(self.branch):3605system(["git","symbolic-ref", head_ref, self.branch])36063607return True36083609classP4Rebase(Command):3610def__init__(self):3611 Command.__init__(self)3612 self.options = [3613 optparse.make_option("--import-labels", dest="importLabels", action="store_true"),3614]3615 self.importLabels =False3616 self.description = ("Fetches the latest revision from perforce and "3617+"rebases the current work (branch) against it")36183619defrun(self, args):3620 sync =P4Sync()3621 sync.importLabels = self.importLabels3622 sync.run([])36233624return self.rebase()36253626defrebase(self):3627if os.system("git update-index --refresh") !=0:3628die("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.");3629iflen(read_pipe("git diff-index HEAD --")) >0:3630die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");36313632[upstream, settings] =findUpstreamBranchPoint()3633iflen(upstream) ==0:3634die("Cannot find upstream branchpoint for rebase")36353636# the branchpoint may be p4/foo~3, so strip off the parent3637 upstream = re.sub("~[0-9]+$","", upstream)36383639print"Rebasing the current branch onto%s"% upstream3640 oldHead =read_pipe("git rev-parse HEAD").strip()3641system("git rebase%s"% upstream)3642system("git diff-tree --stat --summary -M%sHEAD --"% oldHead)3643return True36443645classP4Clone(P4Sync):3646def__init__(self):3647 P4Sync.__init__(self)3648 self.description ="Creates a new git repository and imports from Perforce into it"3649 self.usage ="usage: %prog [options] //depot/path[@revRange]"3650 self.options += [3651 optparse.make_option("--destination", dest="cloneDestination",3652 action='store', default=None,3653help="where to leave result of the clone"),3654 optparse.make_option("--bare", dest="cloneBare",3655 action="store_true", default=False),3656]3657 self.cloneDestination =None3658 self.needsGit =False3659 self.cloneBare =False36603661defdefaultDestination(self, args):3662## TODO: use common prefix of args?3663 depotPath = args[0]3664 depotDir = re.sub("(@[^@]*)$","", depotPath)3665 depotDir = re.sub("(#[^#]*)$","", depotDir)3666 depotDir = re.sub(r"\.\.\.$","", depotDir)3667 depotDir = re.sub(r"/$","", depotDir)3668return os.path.split(depotDir)[1]36693670defrun(self, args):3671iflen(args) <1:3672return False36733674if self.keepRepoPath and not self.cloneDestination:3675 sys.stderr.write("Must specify destination for --keep-path\n")3676 sys.exit(1)36773678 depotPaths = args36793680if not self.cloneDestination andlen(depotPaths) >1:3681 self.cloneDestination = depotPaths[-1]3682 depotPaths = depotPaths[:-1]36833684 self.cloneExclude = ["/"+p for p in self.cloneExclude]3685for p in depotPaths:3686if not p.startswith("//"):3687 sys.stderr.write('Depot paths must start with "//":%s\n'% p)3688return False36893690if not self.cloneDestination:3691 self.cloneDestination = self.defaultDestination(args)36923693print"Importing from%sinto%s"% (', '.join(depotPaths), self.cloneDestination)36943695if not os.path.exists(self.cloneDestination):3696 os.makedirs(self.cloneDestination)3697chdir(self.cloneDestination)36983699 init_cmd = ["git","init"]3700if self.cloneBare:3701 init_cmd.append("--bare")3702 retcode = subprocess.call(init_cmd)3703if retcode:3704raiseCalledProcessError(retcode, init_cmd)37053706if not P4Sync.run(self, depotPaths):3707return False37083709# create a master branch and check out a work tree3710ifgitBranchExists(self.branch):3711system(["git","branch","master", self.branch ])3712if not self.cloneBare:3713system(["git","checkout","-f"])3714else:3715print'Not checking out any branch, use ' \3716'"git checkout -q -b master <branch>"'37173718# auto-set this variable if invoked with --use-client-spec3719if self.useClientSpec_from_options:3720system("git config --bool git-p4.useclientspec true")37213722return True37233724classP4Branches(Command):3725def__init__(self):3726 Command.__init__(self)3727 self.options = [ ]3728 self.description = ("Shows the git branches that hold imports and their "3729+"corresponding perforce depot paths")3730 self.verbose =False37313732defrun(self, args):3733iforiginP4BranchesExist():3734createOrUpdateBranchesFromOrigin()37353736 cmdline ="git rev-parse --symbolic "3737 cmdline +=" --remotes"37383739for line inread_pipe_lines(cmdline):3740 line = line.strip()37413742if not line.startswith('p4/')or line =="p4/HEAD":3743continue3744 branch = line37453746 log =extractLogMessageFromGitCommit("refs/remotes/%s"% branch)3747 settings =extractSettingsGitLog(log)37483749print"%s<=%s(%s)"% (branch,",".join(settings["depot-paths"]), settings["change"])3750return True37513752classHelpFormatter(optparse.IndentedHelpFormatter):3753def__init__(self):3754 optparse.IndentedHelpFormatter.__init__(self)37553756defformat_description(self, description):3757if description:3758return description +"\n"3759else:3760return""37613762defprintUsage(commands):3763print"usage:%s<command> [options]"% sys.argv[0]3764print""3765print"valid commands:%s"%", ".join(commands)3766print""3767print"Try%s<command> --help for command specific help."% sys.argv[0]3768print""37693770commands = {3771"debug": P4Debug,3772"submit": P4Submit,3773"commit": P4Submit,3774"sync": P4Sync,3775"rebase": P4Rebase,3776"clone": P4Clone,3777"rollback": P4RollBack,3778"branches": P4Branches3779}378037813782defmain():3783iflen(sys.argv[1:]) ==0:3784printUsage(commands.keys())3785 sys.exit(2)37863787 cmdName = sys.argv[1]3788try:3789 klass = commands[cmdName]3790 cmd =klass()3791exceptKeyError:3792print"unknown command%s"% cmdName3793print""3794printUsage(commands.keys())3795 sys.exit(2)37963797 options = cmd.options3798 cmd.gitdir = os.environ.get("GIT_DIR",None)37993800 args = sys.argv[2:]38013802 options.append(optparse.make_option("--verbose","-v", dest="verbose", action="store_true"))3803if cmd.needsGit:3804 options.append(optparse.make_option("--git-dir", dest="gitdir"))38053806 parser = optparse.OptionParser(cmd.usage.replace("%prog","%prog "+ cmdName),3807 options,3808 description = cmd.description,3809 formatter =HelpFormatter())38103811(cmd, args) = parser.parse_args(sys.argv[2:], cmd);3812global verbose3813 verbose = cmd.verbose3814if cmd.needsGit:3815if cmd.gitdir ==None:3816 cmd.gitdir = os.path.abspath(".git")3817if notisValidGitDir(cmd.gitdir):3818# "rev-parse --git-dir" without arguments will try $PWD/.git3819 cmd.gitdir =read_pipe("git rev-parse --git-dir").strip()3820if os.path.exists(cmd.gitdir):3821 cdup =read_pipe("git rev-parse --show-cdup").strip()3822iflen(cdup) >0:3823chdir(cdup);38243825if notisValidGitDir(cmd.gitdir):3826ifisValidGitDir(cmd.gitdir +"/.git"):3827 cmd.gitdir +="/.git"3828else:3829die("fatal: cannot locate git repository at%s"% cmd.gitdir)38303831# so git commands invoked from the P4 workspace will succeed3832 os.environ["GIT_DIR"] = cmd.gitdir38333834if not cmd.run(args):3835 parser.print_help()3836 sys.exit(2)383738383839if __name__ =='__main__':3840main()