git.oblomov.eu Git - git/blob - contrib/fast-import/git-p4

   1 #!/usr/bin/env python
   2 #
   3 # git-p4.py -- A tool for bidirectional operation between a Perforce depot and git.
   4 #
   5 # Author: Simon Hausmann <simon@lst.de>
   6 # Copyright: 2007 Simon Hausmann <simon@lst.de>
   7 #            2007 Trolltech ASA
   8 # License: MIT <http://www.opensource.org/licenses/mit-license.php>
   9 #
  10
  11 import optparse, sys, os, marshal, subprocess, shelve
  12 import tempfile, getopt, os.path, time, platform
  13 import re
  14
  15 verbose = False
  16
  17
  18 def p4_build_cmd(cmd):
  19     """Build a suitable p4 command line.
  20
  21     This consolidates building and returning a p4 command line into one
  22     location. It means that hooking into the environment, or other configuration
  23     can be done more easily.
  24     """
  25     real_cmd = "%s " % "p4"
  26
  27     user = gitConfig("git-p4.user")
  28     if len(user) > 0:
  29         real_cmd += "-u %s " % user
  30
  31     password = gitConfig("git-p4.password")
  32     if len(password) > 0:
  33         real_cmd += "-P %s " % password
  34
  35     port = gitConfig("git-p4.port")
  36     if len(port) > 0:
  37         real_cmd += "-p %s " % port
  38
  39     host = gitConfig("git-p4.host")
  40     if len(host) > 0:
  41         real_cmd += "-h %s " % host
  42
  43     client = gitConfig("git-p4.client")
  44     if len(client) > 0:
  45         real_cmd += "-c %s " % client
  46
  47     real_cmd += "%s" % (cmd)
  48     if verbose:
  49         print real_cmd
  50     return real_cmd
  51
  52 def chdir(dir):
  53     if os.name == 'nt':
  54         os.environ['PWD']=dir
  55     os.chdir(dir)
  56
  57 def die(msg):
  58     if verbose:
  59         raise Exception(msg)
  60     else:
  61         sys.stderr.write(msg + "\n")
  62         sys.exit(1)
  63
  64 def write_pipe(c, str):
  65     if verbose:
  66         sys.stderr.write('Writing pipe: %s\n' % c)
  67
  68     pipe = os.popen(c, 'w')
  69     val = pipe.write(str)
  70     if pipe.close():
  71         die('Command failed: %s' % c)
  72
  73     return val
  74
  75 def p4_write_pipe(c, str):
  76     real_cmd = p4_build_cmd(c)
  77     return write_pipe(real_cmd, str)
  78
  79 def read_pipe(c, ignore_error=False):
  80     if verbose:
  81         sys.stderr.write('Reading pipe: %s\n' % c)
  82
  83     pipe = os.popen(c, 'rb')
  84     val = pipe.read()
  85     if pipe.close() and not ignore_error:
  86         die('Command failed: %s' % c)
  87
  88     return val
  89
  90 def p4_read_pipe(c, ignore_error=False):
  91     real_cmd = p4_build_cmd(c)
  92     return read_pipe(real_cmd, ignore_error)
  93
  94 def read_pipe_lines(c):
  95     if verbose:
  96         sys.stderr.write('Reading pipe: %s\n' % c)
  97     ## todo: check return status
  98     pipe = os.popen(c, 'rb')
  99     val = pipe.readlines()
 100     if pipe.close():
 101         die('Command failed: %s' % c)
 102
 103     return val
 104
 105 def p4_read_pipe_lines(c):
 106     """Specifically invoke p4 on the command supplied. """
 107     real_cmd = p4_build_cmd(c)
 108     return read_pipe_lines(real_cmd)
 109
 110 def system(cmd):
 111     if verbose:
 112         sys.stderr.write("executing %s\n" % cmd)
 113     if os.system(cmd) != 0:
 114         die("command failed: %s" % cmd)
 115
 116 def p4_system(cmd):
 117     """Specifically invoke p4 as the system command. """
 118     real_cmd = p4_build_cmd(cmd)
 119     return system(real_cmd)
 120
 121 #
 122 # Canonicalize the p4 type and return a tuple of the
 123 # base type, plus any modifiers.  See "p4 help filetypes"
 124 # for a list and explanation.
 125 #
 126 def split_p4_type(p4type):
 127
 128     p4_filetypes_historical = {
 129         "ctempobj": "binary+Sw",
 130         "ctext": "text+C",
 131         "cxtext": "text+Cx",
 132         "ktext": "text+k",
 133         "kxtext": "text+kx",
 134         "ltext": "text+F",
 135         "tempobj": "binary+FSw",
 136         "ubinary": "binary+F",
 137         "uresource": "resource+F",
 138         "uxbinary": "binary+Fx",
 139         "xbinary": "binary+x",
 140         "xltext": "text+Fx",
 141         "xtempobj": "binary+Swx",
 142         "xtext": "text+x",
 143         "xunicode": "unicode+x",
 144         "xutf16": "utf16+x",
 145     }
 146     if p4type in p4_filetypes_historical:
 147         p4type = p4_filetypes_historical[p4type]
 148     mods = ""
 149     s = p4type.split("+")
 150     base = s[0]
 151     mods = ""
 152     if len(s) > 1:
 153         mods = s[1]
 154     return (base, mods)
 155
 156
 157 def setP4ExecBit(file, mode):
 158     # Reopens an already open file and changes the execute bit to match
 159     # the execute bit setting in the passed in mode.
 160
 161     p4Type = "+x"
 162
 163     if not isModeExec(mode):
 164         p4Type = getP4OpenedType(file)
 165         p4Type = re.sub('^([cku]?)x(.*)', '\\1\\2', p4Type)
 166         p4Type = re.sub('(.*?\+.*?)x(.*?)', '\\1\\2', p4Type)
 167         if p4Type[-1] == "+":
 168             p4Type = p4Type[0:-1]
 169
 170     p4_system("reopen -t %s %s" % (p4Type, file))
 171
 172 def getP4OpenedType(file):
 173     # Returns the perforce file type for the given file.
 174
 175     result = p4_read_pipe("opened %s" % file)
 176     match = re.match(".*\((.+)\)\r?$", result)
 177     if match:
 178         return match.group(1)
 179     else:
 180         die("Could not determine file type for %s (result: '%s')" % (file, result))
 181
 182 def diffTreePattern():
 183     # This is a simple generator for the diff tree regex pattern. This could be
 184     # a class variable if this and parseDiffTreeEntry were a part of a class.
 185     pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)')
 186     while True:
 187         yield pattern
 188
 189 def parseDiffTreeEntry(entry):
 190     """Parses a single diff tree entry into its component elements.
 191
 192     See git-diff-tree(1) manpage for details about the format of the diff
 193     output. This method returns a dictionary with the following elements:
 194
 195     src_mode - The mode of the source file
 196     dst_mode - The mode of the destination file
 197     src_sha1 - The sha1 for the source file
 198     dst_sha1 - The sha1 fr the destination file
 199     status - The one letter status of the diff (i.e. 'A', 'M', 'D', etc)
 200     status_score - The score for the status (applicable for 'C' and 'R'
 201                    statuses). This is None if there is no score.
 202     src - The path for the source file.
 203     dst - The path for the destination file. This is only present for
 204           copy or renames. If it is not present, this is None.
 205
 206     If the pattern is not matched, None is returned."""
 207
 208     match = diffTreePattern().next().match(entry)
 209     if match:
 210         return {
 211             'src_mode': match.group(1),
 212             'dst_mode': match.group(2),
 213             'src_sha1': match.group(3),
 214             'dst_sha1': match.group(4),
 215             'status': match.group(5),
 216             'status_score': match.group(6),
 217             'src': match.group(7),
 218             'dst': match.group(10)
 219         }
 220     return None
 221
 222 def isModeExec(mode):
 223     # Returns True if the given git mode represents an executable file,
 224     # otherwise False.
 225     return mode[-3:] == "755"
 226
 227 def isModeExecChanged(src_mode, dst_mode):
 228     return isModeExec(src_mode) != isModeExec(dst_mode)
 229
 230 def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None):
 231     cmd = p4_build_cmd("-G %s" % (cmd))
 232     if verbose:
 233         sys.stderr.write("Opening pipe: %s\n" % cmd)
 234
 235     # Use a temporary file to avoid deadlocks without
 236     # subprocess.communicate(), which would put another copy
 237     # of stdout into memory.
 238     stdin_file = None
 239     if stdin is not None:
 240         stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode)
 241         stdin_file.write(stdin)
 242         stdin_file.flush()
 243         stdin_file.seek(0)
 244
 245     p4 = subprocess.Popen(cmd, shell=True,
 246                           stdin=stdin_file,
 247                           stdout=subprocess.PIPE)
 248
 249     result = []
 250     try:
 251         while True:
 252             entry = marshal.load(p4.stdout)
 253             if cb is not None:
 254                 cb(entry)
 255             else:
 256                 result.append(entry)
 257     except EOFError:
 258         pass
 259     exitCode = p4.wait()
 260     if exitCode != 0:
 261         entry = {}
 262         entry["p4ExitCode"] = exitCode
 263         result.append(entry)
 264
 265     return result
 266
 267 def p4Cmd(cmd):
 268     list = p4CmdList(cmd)
 269     result = {}
 270     for entry in list:
 271         result.update(entry)
 272     return result;
 273
 274 def p4Where(depotPath):
 275     if not depotPath.endswith("/"):
 276         depotPath += "/"
 277     depotPath = depotPath + "..."
 278     outputList = p4CmdList("where %s" % depotPath)
 279     output = None
 280     for entry in outputList:
 281         if "depotFile" in entry:
 282             if entry["depotFile"] == depotPath:
 283                 output = entry
 284                 break
 285         elif "data" in entry:
 286             data = entry.get("data")
 287             space = data.find(" ")
 288             if data[:space] == depotPath:
 289                 output = entry
 290                 break
 291     if output == None:
 292         return ""
 293     if output["code"] == "error":
 294         return ""
 295     clientPath = ""
 296     if "path" in output:
 297         clientPath = output.get("path")
 298     elif "data" in output:
 299         data = output.get("data")
 300         lastSpace = data.rfind(" ")
 301         clientPath = data[lastSpace + 1:]
 302
 303     if clientPath.endswith("..."):
 304         clientPath = clientPath[:-3]
 305     return clientPath
 306
 307 def currentGitBranch():
 308     return read_pipe("git name-rev HEAD").split(" ")[1].strip()
 309
 310 def isValidGitDir(path):
 311     if (os.path.exists(path + "/HEAD")
 312         and os.path.exists(path + "/refs") and os.path.exists(path + "/objects")):
 313         return True;
 314     return False
 315
 316 def parseRevision(ref):
 317     return read_pipe("git rev-parse %s" % ref).strip()
 318
 319 def extractLogMessageFromGitCommit(commit):
 320     logMessage = ""
 321
 322     ## fixme: title is first line of commit, not 1st paragraph.
 323     foundTitle = False
 324     for log in read_pipe_lines("git cat-file commit %s" % commit):
 325        if not foundTitle:
 326            if len(log) == 1:
 327                foundTitle = True
 328            continue
 329
 330        logMessage += log
 331     return logMessage
 332
 333 def extractSettingsGitLog(log):
 334     values = {}
 335     for line in log.split("\n"):
 336         line = line.strip()
 337         m = re.search (r"^ *\[git-p4: (.*)\]$", line)
 338         if not m:
 339             continue
 340
 341         assignments = m.group(1).split (':')
 342         for a in assignments:
 343             vals = a.split ('=')
 344             key = vals[0].strip()
 345             val = ('='.join (vals[1:])).strip()
 346             if val.endswith ('\"') and val.startswith('"'):
 347                 val = val[1:-1]
 348
 349             values[key] = val
 350
 351     paths = values.get("depot-paths")
 352     if not paths:
 353         paths = values.get("depot-path")
 354     if paths:
 355         values['depot-paths'] = paths.split(',')
 356     return values
 357
 358 def gitBranchExists(branch):
 359     proc = subprocess.Popen(["git", "rev-parse", branch],
 360                             stderr=subprocess.PIPE, stdout=subprocess.PIPE);
 361     return proc.wait() == 0;
 362
 363 _gitConfig = {}
 364 def gitConfig(key, args = None): # set args to "--bool", for instance
 365     if not _gitConfig.has_key(key):
 366         argsFilter = ""
 367         if args != None:
 368             argsFilter = "%s " % args
 369         cmd = "git config %s%s" % (argsFilter, key)
 370         _gitConfig[key] = read_pipe(cmd, ignore_error=True).strip()
 371     return _gitConfig[key]
 372
 373 def gitConfigList(key):
 374     if not _gitConfig.has_key(key):
 375         _gitConfig[key] = read_pipe("git config --get-all %s" % key, ignore_error=True).strip().split(os.linesep)
 376     return _gitConfig[key]
 377
 378 def p4BranchesInGit(branchesAreInRemotes = True):
 379     branches = {}
 380
 381     cmdline = "git rev-parse --symbolic "
 382     if branchesAreInRemotes:
 383         cmdline += " --remotes"
 384     else:
 385         cmdline += " --branches"
 386
 387     for line in read_pipe_lines(cmdline):
 388         line = line.strip()
 389
 390         ## only import to p4/
 391         if not line.startswith('p4/') or line == "p4/HEAD":
 392             continue
 393         branch = line
 394
 395         # strip off p4
 396         branch = re.sub ("^p4/", "", line)
 397
 398         branches[branch] = parseRevision(line)
 399     return branches
 400
 401 def findUpstreamBranchPoint(head = "HEAD"):
 402     branches = p4BranchesInGit()
 403     # map from depot-path to branch name
 404     branchByDepotPath = {}
 405     for branch in branches.keys():
 406         tip = branches[branch]
 407         log = extractLogMessageFromGitCommit(tip)
 408         settings = extractSettingsGitLog(log)
 409         if settings.has_key("depot-paths"):
 410             paths = ",".join(settings["depot-paths"])
 411             branchByDepotPath[paths] = "remotes/p4/" + branch
 412
 413     settings = None
 414     parent = 0
 415     while parent < 65535:
 416         commit = head + "~%s" % parent
 417         log = extractLogMessageFromGitCommit(commit)
 418         settings = extractSettingsGitLog(log)
 419         if settings.has_key("depot-paths"):
 420             paths = ",".join(settings["depot-paths"])
 421             if branchByDepotPath.has_key(paths):
 422                 return [branchByDepotPath[paths], settings]
 423
 424         parent = parent + 1
 425
 426     return ["", settings]
 427
 428 def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent=True):
 429     if not silent:
 430         print ("Creating/updating branch(es) in %s based on origin branch(es)"
 431                % localRefPrefix)
 432
 433     originPrefix = "origin/p4/"
 434
 435     for line in read_pipe_lines("git rev-parse --symbolic --remotes"):
 436         line = line.strip()
 437         if (not line.startswith(originPrefix)) or line.endswith("HEAD"):
 438             continue
 439
 440         headName = line[len(originPrefix):]
 441         remoteHead = localRefPrefix + headName
 442         originHead = line
 443
 444         original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead))
 445         if (not original.has_key('depot-paths')
 446             or not original.has_key('change')):
 447             continue
 448
 449         update = False
 450         if not gitBranchExists(remoteHead):
 451             if verbose:
 452                 print "creating %s" % remoteHead
 453             update = True
 454         else:
 455             settings = extractSettingsGitLog(extractLogMessageFromGitCommit(remoteHead))
 456             if settings.has_key('change') > 0:
 457                 if settings['depot-paths'] == original['depot-paths']:
 458                     originP4Change = int(original['change'])
 459                     p4Change = int(settings['change'])
 460                     if originP4Change > p4Change:
 461                         print ("%s (%s) is newer than %s (%s). "
 462                                "Updating p4 branch from origin."
 463                                % (originHead, originP4Change,
 464                                   remoteHead, p4Change))
 465                         update = True
 466                 else:
 467                     print ("Ignoring: %s was imported from %s while "
 468                            "%s was imported from %s"
 469                            % (originHead, ','.join(original['depot-paths']),
 470                               remoteHead, ','.join(settings['depot-paths'])))
 471
 472         if update:
 473             system("git update-ref %s %s" % (remoteHead, originHead))
 474
 475 def originP4BranchesExist():
 476         return gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
 477
 478 def p4ChangesForPaths(depotPaths, changeRange):
 479     assert depotPaths
 480     output = p4_read_pipe_lines("changes " + ' '.join (["%s...%s" % (p, changeRange)
 481                                                         for p in depotPaths]))
 482
 483     changes = {}
 484     for line in output:
 485         changeNum = int(line.split(" ")[1])
 486         changes[changeNum] = True
 487
 488     changelist = changes.keys()
 489     changelist.sort()
 490     return changelist
 491
 492 def p4PathStartsWith(path, prefix):
 493     # This method tries to remedy a potential mixed-case issue:
 494     #
 495     # If UserA adds  //depot/DirA/file1
 496     # and UserB adds //depot/dira/file2
 497     #
 498     # we may or may not have a problem. If you have core.ignorecase=true,
 499     # we treat DirA and dira as the same directory
 500     ignorecase = gitConfig("core.ignorecase", "--bool") == "true"
 501     if ignorecase:
 502         return path.lower().startswith(prefix.lower())
 503     return path.startswith(prefix)
 504
 505 class Command:
 506     def __init__(self):
 507         self.usage = "usage: %prog [options]"
 508         self.needsGit = True
 509
 510 class P4UserMap:
 511     def __init__(self):
 512         self.userMapFromPerforceServer = False
 513
 514     def getUserCacheFilename(self):
 515         home = os.environ.get("HOME", os.environ.get("USERPROFILE"))
 516         return home + "/.gitp4-usercache.txt"
 517
 518     def getUserMapFromPerforceServer(self):
 519         if self.userMapFromPerforceServer:
 520             return
 521         self.users = {}
 522         self.emails = {}
 523
 524         for output in p4CmdList("users"):
 525             if not output.has_key("User"):
 526                 continue
 527             self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
 528             self.emails[output["Email"]] = output["User"]
 529
 530
 531         s = ''
 532         for (key, val) in self.users.items():
 533             s += "%s\t%s\n" % (key.expandtabs(1), val.expandtabs(1))
 534
 535         open(self.getUserCacheFilename(), "wb").write(s)
 536         self.userMapFromPerforceServer = True
 537
 538     def loadUserMapFromCache(self):
 539         self.users = {}
 540         self.userMapFromPerforceServer = False
 541         try:
 542             cache = open(self.getUserCacheFilename(), "rb")
 543             lines = cache.readlines()
 544             cache.close()
 545             for line in lines:
 546                 entry = line.strip().split("\t")
 547                 self.users[entry[0]] = entry[1]
 548         except IOError:
 549             self.getUserMapFromPerforceServer()
 550
 551 class P4Debug(Command):
 552     def __init__(self):
 553         Command.__init__(self)
 554         self.options = [
 555             optparse.make_option("--verbose", dest="verbose", action="store_true",
 556                                  default=False),
 557             ]
 558         self.description = "A tool to debug the output of p4 -G."
 559         self.needsGit = False
 560         self.verbose = False
 561
 562     def run(self, args):
 563         j = 0
 564         for output in p4CmdList(" ".join(args)):
 565             print 'Element: %d' % j
 566             j += 1
 567             print output
 568         return True
 569
 570 class P4RollBack(Command):
 571     def __init__(self):
 572         Command.__init__(self)
 573         self.options = [
 574             optparse.make_option("--verbose", dest="verbose", action="store_true"),
 575             optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true")
 576         ]
 577         self.description = "A tool to debug the multi-branch import. Don't use :)"
 578         self.verbose = False
 579         self.rollbackLocalBranches = False
 580
 581     def run(self, args):
 582         if len(args) != 1:
 583             return False
 584         maxChange = int(args[0])
 585
 586         if "p4ExitCode" in p4Cmd("changes -m 1"):
 587             die("Problems executing p4");
 588
 589         if self.rollbackLocalBranches:
 590             refPrefix = "refs/heads/"
 591             lines = read_pipe_lines("git rev-parse --symbolic --branches")
 592         else:
 593             refPrefix = "refs/remotes/"
 594             lines = read_pipe_lines("git rev-parse --symbolic --remotes")
 595
 596         for line in lines:
 597             if self.rollbackLocalBranches or (line.startswith("p4/") and line != "p4/HEAD\n"):
 598                 line = line.strip()
 599                 ref = refPrefix + line
 600                 log = extractLogMessageFromGitCommit(ref)
 601                 settings = extractSettingsGitLog(log)
 602
 603                 depotPaths = settings['depot-paths']
 604                 change = settings['change']
 605
 606                 changed = False
 607
 608                 if len(p4Cmd("changes -m 1 "  + ' '.join (['%s...@%s' % (p, maxChange)
 609                                                            for p in depotPaths]))) == 0:
 610                     print "Branch %s did not exist at change %s, deleting." % (ref, maxChange)
 611                     system("git update-ref -d %s `git rev-parse %s`" % (ref, ref))
 612                     continue
 613
 614                 while change and int(change) > maxChange:
 615                     changed = True
 616                     if self.verbose:
 617                         print "%s is at %s ; rewinding towards %s" % (ref, change, maxChange)
 618                     system("git update-ref %s \"%s^\"" % (ref, ref))
 619                     log = extractLogMessageFromGitCommit(ref)
 620                     settings =  extractSettingsGitLog(log)
 621
 622
 623                     depotPaths = settings['depot-paths']
 624                     change = settings['change']
 625
 626                 if changed:
 627                     print "%s rewound to %s" % (ref, change)
 628
 629         return True
 630
 631 class P4Submit(Command, P4UserMap):
 632     def __init__(self):
 633         Command.__init__(self)
 634         P4UserMap.__init__(self)
 635         self.options = [
 636                 optparse.make_option("--verbose", dest="verbose", action="store_true"),
 637                 optparse.make_option("--origin", dest="origin"),
 638                 optparse.make_option("-M", dest="detectRenames", action="store_true"),
 639                 # preserve the user, requires relevant p4 permissions
 640                 optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"),
 641         ]
 642         self.description = "Submit changes from git to the perforce depot."
 643         self.usage += " [name of git branch to submit into perforce depot]"
 644         self.interactive = True
 645         self.origin = ""
 646         self.detectRenames = False
 647         self.verbose = False
 648         self.preserveUser = gitConfig("git-p4.preserveUser").lower() == "true"
 649         self.isWindows = (platform.system() == "Windows")
 650         self.myP4UserId = None
 651
 652     def check(self):
 653         if len(p4CmdList("opened ...")) > 0:
 654             die("You have files opened with perforce! Close them before starting the sync.")
 655
 656     # replaces everything between 'Description:' and the next P4 submit template field with the
 657     # commit message
 658     def prepareLogMessage(self, template, message):
 659         result = ""
 660
 661         inDescriptionSection = False
 662
 663         for line in template.split("\n"):
 664             if line.startswith("#"):
 665                 result += line + "\n"
 666                 continue
 667
 668             if inDescriptionSection:
 669                 if line.startswith("Files:") or line.startswith("Jobs:"):
 670                     inDescriptionSection = False
 671                 else:
 672                     continue
 673             else:
 674                 if line.startswith("Description:"):
 675                     inDescriptionSection = True
 676                     line += "\n"
 677                     for messageLine in message.split("\n"):
 678                         line += "\t" + messageLine + "\n"
 679
 680             result += line + "\n"
 681
 682         return result
 683
 684     def p4UserForCommit(self,id):
 685         # Return the tuple (perforce user,git email) for a given git commit id
 686         self.getUserMapFromPerforceServer()
 687         gitEmail = read_pipe("git log --max-count=1 --format='%%ae' %s" % id)
 688         gitEmail = gitEmail.strip()
 689         if not self.emails.has_key(gitEmail):
 690             return (None,gitEmail)
 691         else:
 692             return (self.emails[gitEmail],gitEmail)
 693
 694     def checkValidP4Users(self,commits):
 695         # check if any git authors cannot be mapped to p4 users
 696         for id in commits:
 697             (user,email) = self.p4UserForCommit(id)
 698             if not user:
 699                 msg = "Cannot find p4 user for email %s in commit %s." % (email, id)
 700                 if gitConfig('git-p4.allowMissingP4Users').lower() == "true":
 701                     print "%s" % msg
 702                 else:
 703                     die("Error: %s\nSet git-p4.allowMissingP4Users to true to allow this." % msg)
 704
 705     def lastP4Changelist(self):
 706         # Get back the last changelist number submitted in this client spec. This
 707         # then gets used to patch up the username in the change. If the same
 708         # client spec is being used by multiple processes then this might go
 709         # wrong.
 710         results = p4CmdList("client -o")        # find the current client
 711         client = None
 712         for r in results:
 713             if r.has_key('Client'):
 714                 client = r['Client']
 715                 break
 716         if not client:
 717             die("could not get client spec")
 718         results = p4CmdList("changes -c %s -m 1" % client)
 719         for r in results:
 720             if r.has_key('change'):
 721                 return r['change']
 722         die("Could not get changelist number for last submit - cannot patch up user details")
 723
 724     def modifyChangelistUser(self, changelist, newUser):
 725         # fixup the user field of a changelist after it has been submitted.
 726         changes = p4CmdList("change -o %s" % changelist)
 727         if len(changes) != 1:
 728             die("Bad output from p4 change modifying %s to user %s" %
 729                 (changelist, newUser))
 730
 731         c = changes[0]
 732         if c['User'] == newUser: return   # nothing to do
 733         c['User'] = newUser
 734         input = marshal.dumps(c)
 735
 736         result = p4CmdList("change -f -i", stdin=input)
 737         for r in result:
 738             if r.has_key('code'):
 739                 if r['code'] == 'error':
 740                     die("Could not modify user field of changelist %s to %s:%s" % (changelist, newUser, r['data']))
 741             if r.has_key('data'):
 742                 print("Updated user field for changelist %s to %s" % (changelist, newUser))
 743                 return
 744         die("Could not modify user field of changelist %s to %s" % (changelist, newUser))
 745
 746     def canChangeChangelists(self):
 747         # check to see if we have p4 admin or super-user permissions, either of
 748         # which are required to modify changelists.
 749         results = p4CmdList("protects %s" % self.depotPath)
 750         for r in results:
 751             if r.has_key('perm'):
 752                 if r['perm'] == 'admin':
 753                     return 1
 754                 if r['perm'] == 'super':
 755                     return 1
 756         return 0
 757
 758     def p4UserId(self):
 759         if self.myP4UserId:
 760             return self.myP4UserId
 761
 762         results = p4CmdList("user -o")
 763         for r in results:
 764             if r.has_key('User'):
 765                 self.myP4UserId = r['User']
 766                 return r['User']
 767         die("Could not find your p4 user id")
 768
 769     def p4UserIsMe(self, p4User):
 770         # return True if the given p4 user is actually me
 771         me = self.p4UserId()
 772         if not p4User or p4User != me:
 773             return False
 774         else:
 775             return True
 776
 777     def prepareSubmitTemplate(self):
 778         # remove lines in the Files section that show changes to files outside the depot path we're committing into
 779         template = ""
 780         inFilesSection = False
 781         for line in p4_read_pipe_lines("change -o"):
 782             if line.endswith("\r\n"):
 783                 line = line[:-2] + "\n"
 784             if inFilesSection:
 785                 if line.startswith("\t"):
 786                     # path starts and ends with a tab
 787                     path = line[1:]
 788                     lastTab = path.rfind("\t")
 789                     if lastTab != -1:
 790                         path = path[:lastTab]
 791                         if not p4PathStartsWith(path, self.depotPath):
 792                             continue
 793                 else:
 794                     inFilesSection = False
 795             else:
 796                 if line.startswith("Files:"):
 797                     inFilesSection = True
 798
 799             template += line
 800
 801         return template
 802
 803     def applyCommit(self, id):
 804         print "Applying %s" % (read_pipe("git log --max-count=1 --pretty=oneline %s" % id))
 805
 806         (p4User, gitEmail) = self.p4UserForCommit(id)
 807
 808         if not self.detectRenames:
 809             # If not explicitly set check the config variable
 810             self.detectRenames = gitConfig("git-p4.detectRenames")
 811
 812         if self.detectRenames.lower() == "false" or self.detectRenames == "":
 813             diffOpts = ""
 814         elif self.detectRenames.lower() == "true":
 815             diffOpts = "-M"
 816         else:
 817             diffOpts = "-M%s" % self.detectRenames
 818
 819         detectCopies = gitConfig("git-p4.detectCopies")
 820         if detectCopies.lower() == "true":
 821             diffOpts += " -C"
 822         elif detectCopies != "" and detectCopies.lower() != "false":
 823             diffOpts += " -C%s" % detectCopies
 824
 825         if gitConfig("git-p4.detectCopiesHarder", "--bool") == "true":
 826             diffOpts += " --find-copies-harder"
 827
 828         diff = read_pipe_lines("git diff-tree -r %s \"%s^\" \"%s\"" % (diffOpts, id, id))
 829         filesToAdd = set()
 830         filesToDelete = set()
 831         editedFiles = set()
 832         filesToChangeExecBit = {}
 833         for line in diff:
 834             diff = parseDiffTreeEntry(line)
 835             modifier = diff['status']
 836             path = diff['src']
 837             if modifier == "M":
 838                 p4_system("edit \"%s\"" % path)
 839                 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
 840                     filesToChangeExecBit[path] = diff['dst_mode']
 841                 editedFiles.add(path)
 842             elif modifier == "A":
 843                 filesToAdd.add(path)
 844                 filesToChangeExecBit[path] = diff['dst_mode']
 845                 if path in filesToDelete:
 846                     filesToDelete.remove(path)
 847             elif modifier == "D":
 848                 filesToDelete.add(path)
 849                 if path in filesToAdd:
 850                     filesToAdd.remove(path)
 851             elif modifier == "C":
 852                 src, dest = diff['src'], diff['dst']
 853                 p4_system("integrate -Dt \"%s\" \"%s\"" % (src, dest))
 854                 if diff['src_sha1'] != diff['dst_sha1']:
 855                     p4_system("edit \"%s\"" % (dest))
 856                 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
 857                     p4_system("edit \"%s\"" % (dest))
 858                     filesToChangeExecBit[dest] = diff['dst_mode']
 859                 os.unlink(dest)
 860                 editedFiles.add(dest)
 861             elif modifier == "R":
 862                 src, dest = diff['src'], diff['dst']
 863                 p4_system("integrate -Dt \"%s\" \"%s\"" % (src, dest))
 864                 if diff['src_sha1'] != diff['dst_sha1']:
 865                     p4_system("edit \"%s\"" % (dest))
 866                 if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
 867                     p4_system("edit \"%s\"" % (dest))
 868                     filesToChangeExecBit[dest] = diff['dst_mode']
 869                 os.unlink(dest)
 870                 editedFiles.add(dest)
 871                 filesToDelete.add(src)
 872             else:
 873                 die("unknown modifier %s for %s" % (modifier, path))
 874
 875         diffcmd = "git format-patch -k --stdout \"%s^\"..\"%s\"" % (id, id)
 876         patchcmd = diffcmd + " | git apply "
 877         tryPatchCmd = patchcmd + "--check -"
 878         applyPatchCmd = patchcmd + "--check --apply -"
 879
 880         if os.system(tryPatchCmd) != 0:
 881             print "Unfortunately applying the change failed!"
 882             print "What do you want to do?"
 883             response = "x"
 884             while response != "s" and response != "a" and response != "w":
 885                 response = raw_input("[s]kip this patch / [a]pply the patch forcibly "
 886                                      "and with .rej files / [w]rite the patch to a file (patch.txt) ")
 887             if response == "s":
 888                 print "Skipping! Good luck with the next patches..."
 889                 for f in editedFiles:
 890                     p4_system("revert \"%s\"" % f);
 891                 for f in filesToAdd:
 892                     system("rm %s" %f)
 893                 return
 894             elif response == "a":
 895                 os.system(applyPatchCmd)
 896                 if len(filesToAdd) > 0:
 897                     print "You may also want to call p4 add on the following files:"
 898                     print " ".join(filesToAdd)
 899                 if len(filesToDelete):
 900                     print "The following files should be scheduled for deletion with p4 delete:"
 901                     print " ".join(filesToDelete)
 902                 die("Please resolve and submit the conflict manually and "
 903                     + "continue afterwards with git-p4 submit --continue")
 904             elif response == "w":
 905                 system(diffcmd + " > patch.txt")
 906                 print "Patch saved to patch.txt in %s !" % self.clientPath
 907                 die("Please resolve and submit the conflict manually and "
 908                     "continue afterwards with git-p4 submit --continue")
 909
 910         system(applyPatchCmd)
 911
 912         for f in filesToAdd:
 913             p4_system("add \"%s\"" % f)
 914         for f in filesToDelete:
 915             p4_system("revert \"%s\"" % f)
 916             p4_system("delete \"%s\"" % f)
 917
 918         # Set/clear executable bits
 919         for f in filesToChangeExecBit.keys():
 920             mode = filesToChangeExecBit[f]
 921             setP4ExecBit(f, mode)
 922
 923         logMessage = extractLogMessageFromGitCommit(id)
 924         logMessage = logMessage.strip()
 925
 926         template = self.prepareSubmitTemplate()
 927
 928         if self.interactive:
 929             submitTemplate = self.prepareLogMessage(template, logMessage)
 930
 931             if self.preserveUser:
 932                submitTemplate = submitTemplate + ("\n######## Actual user %s, modified after commit\n" % p4User)
 933
 934             if os.environ.has_key("P4DIFF"):
 935                 del(os.environ["P4DIFF"])
 936             diff = ""
 937             for editedFile in editedFiles:
 938                 diff += p4_read_pipe("diff -du %r" % editedFile)
 939
 940             newdiff = ""
 941             for newFile in filesToAdd:
 942                 newdiff += "==== new file ====\n"
 943                 newdiff += "--- /dev/null\n"
 944                 newdiff += "+++ %s\n" % newFile
 945                 f = open(newFile, "r")
 946                 for line in f.readlines():
 947                     newdiff += "+" + line
 948                 f.close()
 949
 950             if self.checkAuthorship and not self.p4UserIsMe(p4User):
 951                 submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail
 952                 submitTemplate += "######## Use git-p4 option --preserve-user to modify authorship\n"
 953                 submitTemplate += "######## Use git-p4 config git-p4.skipUserNameCheck hides this message.\n"
 954
 955             separatorLine = "######## everything below this line is just the diff #######\n"
 956
 957             [handle, fileName] = tempfile.mkstemp()
 958             tmpFile = os.fdopen(handle, "w+")
 959             if self.isWindows:
 960                 submitTemplate = submitTemplate.replace("\n", "\r\n")
 961                 separatorLine = separatorLine.replace("\n", "\r\n")
 962                 newdiff = newdiff.replace("\n", "\r\n")
 963             tmpFile.write(submitTemplate + separatorLine + diff + newdiff)
 964             tmpFile.close()
 965             mtime = os.stat(fileName).st_mtime
 966             if os.environ.has_key("P4EDITOR"):
 967                 editor = os.environ.get("P4EDITOR")
 968             else:
 969                 editor = read_pipe("git var GIT_EDITOR").strip()
 970             system(editor + " " + fileName)
 971
 972             if gitConfig("git-p4.skipSubmitEditCheck") == "true":
 973                 checkModTime = False
 974             else:
 975                 checkModTime = True
 976
 977             response = "y"
 978             if checkModTime and (os.stat(fileName).st_mtime <= mtime):
 979                 response = "x"
 980                 while response != "y" and response != "n":
 981                     response = raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")
 982
 983             if response == "y":
 984                 tmpFile = open(fileName, "rb")
 985                 message = tmpFile.read()
 986                 tmpFile.close()
 987                 submitTemplate = message[:message.index(separatorLine)]
 988                 if self.isWindows:
 989                     submitTemplate = submitTemplate.replace("\r\n", "\n")
 990                 p4_write_pipe("submit -i", submitTemplate)
 991
 992                 if self.preserveUser:
 993                     if p4User:
 994                         # Get last changelist number. Cannot easily get it from
 995                         # the submit command output as the output is unmarshalled.
 996                         changelist = self.lastP4Changelist()
 997                         self.modifyChangelistUser(changelist, p4User)
 998
 999             else:
1000                 for f in editedFiles:
1001                     p4_system("revert \"%s\"" % f);
1002                 for f in filesToAdd:
1003                     p4_system("revert \"%s\"" % f);
1004                     system("rm %s" %f)
1005
1006             os.remove(fileName)
1007         else:
1008             fileName = "submit.txt"
1009             file = open(fileName, "w+")
1010             file.write(self.prepareLogMessage(template, logMessage))
1011             file.close()
1012             print ("Perforce submit template written as %s. "
1013                    + "Please review/edit and then use p4 submit -i < %s to submit directly!"
1014                    % (fileName, fileName))
1015
1016     def run(self, args):
1017         if len(args) == 0:
1018             self.master = currentGitBranch()
1019             if len(self.master) == 0 or not gitBranchExists("refs/heads/%s" % self.master):
1020                 die("Detecting current git branch failed!")
1021         elif len(args) == 1:
1022             self.master = args[0]
1023         else:
1024             return False
1025
1026         allowSubmit = gitConfig("git-p4.allowSubmit")
1027         if len(allowSubmit) > 0 and not self.master in allowSubmit.split(","):
1028             die("%s is not in git-p4.allowSubmit" % self.master)
1029
1030         [upstream, settings] = findUpstreamBranchPoint()
1031         self.depotPath = settings['depot-paths'][0]
1032         if len(self.origin) == 0:
1033             self.origin = upstream
1034
1035         if self.preserveUser:
1036             if not self.canChangeChangelists():
1037                 die("Cannot preserve user names without p4 super-user or admin permissions")
1038
1039         if self.verbose:
1040             print "Origin branch is " + self.origin
1041
1042         if len(self.depotPath) == 0:
1043             print "Internal error: cannot locate perforce depot path from existing branches"
1044             sys.exit(128)
1045
1046         self.clientPath = p4Where(self.depotPath)
1047
1048         if len(self.clientPath) == 0:
1049             print "Error: Cannot locate perforce checkout of %s in client view" % self.depotPath
1050             sys.exit(128)
1051
1052         print "Perforce checkout for depot path %s located at %s" % (self.depotPath, self.clientPath)
1053         self.oldWorkingDirectory = os.getcwd()
1054
1055         chdir(self.clientPath)
1056         print "Synchronizing p4 checkout..."
1057         p4_system("sync ...")
1058
1059         self.check()
1060
1061         commits = []
1062         for line in read_pipe_lines("git rev-list --no-merges %s..%s" % (self.origin, self.master)):
1063             commits.append(line.strip())
1064         commits.reverse()
1065
1066         if self.preserveUser or (gitConfig("git-p4.skipUserNameCheck") == "true"):
1067             self.checkAuthorship = False
1068         else:
1069             self.checkAuthorship = True
1070
1071         if self.preserveUser:
1072             self.checkValidP4Users(commits)
1073
1074         while len(commits) > 0:
1075             commit = commits[0]
1076             commits = commits[1:]
1077             self.applyCommit(commit)
1078             if not self.interactive:
1079                 break
1080
1081         if len(commits) == 0:
1082             print "All changes applied!"
1083             chdir(self.oldWorkingDirectory)
1084
1085             sync = P4Sync()
1086             sync.run([])
1087
1088             rebase = P4Rebase()
1089             rebase.rebase()
1090
1091         return True
1092
1093 class P4Sync(Command, P4UserMap):
1094     delete_actions = ( "delete", "move/delete", "purge" )
1095
1096     def __init__(self):
1097         Command.__init__(self)
1098         P4UserMap.__init__(self)
1099         self.options = [
1100                 optparse.make_option("--branch", dest="branch"),
1101                 optparse.make_option("--detect-branches", dest="detectBranches", action="store_true"),
1102                 optparse.make_option("--changesfile", dest="changesFile"),
1103                 optparse.make_option("--silent", dest="silent", action="store_true"),
1104                 optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),
1105                 optparse.make_option("--verbose", dest="verbose", action="store_true"),
1106                 optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false",
1107                                      help="Import into refs/heads/ , not refs/remotes"),
1108                 optparse.make_option("--max-changes", dest="maxChanges"),
1109                 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',
1110                                      help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),
1111                 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',
1112                                      help="Only sync files that are included in the Perforce Client Spec")
1113         ]
1114         self.description = """Imports from Perforce into a git repository.\n
1115     example:
1116     //depot/my/project/ -- to import the current head
1117     //depot/my/project/@all -- to import everything
1118     //depot/my/project/@1,6 -- to import only from revision 1 to 6
1119
1120     (a ... is not needed in the path p4 specification, it's added implicitly)"""
1121
1122         self.usage += " //depot/path[@revRange]"
1123         self.silent = False
1124         self.createdBranches = set()
1125         self.committedChanges = set()
1126         self.branch = ""
1127         self.detectBranches = False
1128         self.detectLabels = False
1129         self.changesFile = ""
1130         self.syncWithOrigin = True
1131         self.verbose = False
1132         self.importIntoRemotes = True
1133         self.maxChanges = ""
1134         self.isWindows = (platform.system() == "Windows")
1135         self.keepRepoPath = False
1136         self.depotPaths = None
1137         self.p4BranchesInGit = []
1138         self.cloneExclude = []
1139         self.useClientSpec = False
1140         self.clientSpecDirs = []
1141
1142         if gitConfig("git-p4.syncFromOrigin") == "false":
1143             self.syncWithOrigin = False
1144
1145     #
1146     # P4 wildcards are not allowed in filenames.  P4 complains
1147     # if you simply add them, but you can force it with "-f", in
1148     # which case it translates them into %xx encoding internally.
1149     # Search for and fix just these four characters.  Do % last so
1150     # that fixing it does not inadvertently create new %-escapes.
1151     #
1152     def wildcard_decode(self, path):
1153         # Cannot have * in a filename in windows; untested as to
1154         # what p4 would do in such a case.
1155         if not self.isWindows:
1156             path = path.replace("%2A", "*")
1157         path = path.replace("%23", "#") \
1158                    .replace("%40", "@") \
1159                    .replace("%25", "%")
1160         return path
1161
1162     def extractFilesFromCommit(self, commit):
1163         self.cloneExclude = [re.sub(r"\.\.\.$", "", path)
1164                              for path in self.cloneExclude]
1165         files = []
1166         fnum = 0
1167         while commit.has_key("depotFile%s" % fnum):
1168             path =  commit["depotFile%s" % fnum]
1169
1170             if [p for p in self.cloneExclude
1171                 if p4PathStartsWith(path, p)]:
1172                 found = False
1173             else:
1174                 found = [p for p in self.depotPaths
1175                          if p4PathStartsWith(path, p)]
1176             if not found:
1177                 fnum = fnum + 1
1178                 continue
1179
1180             file = {}
1181             file["path"] = path
1182             file["rev"] = commit["rev%s" % fnum]
1183             file["action"] = commit["action%s" % fnum]
1184             file["type"] = commit["type%s" % fnum]
1185             files.append(file)
1186             fnum = fnum + 1
1187         return files
1188
1189     def stripRepoPath(self, path, prefixes):
1190         if self.useClientSpec:
1191
1192             # if using the client spec, we use the output directory
1193             # specified in the client.  For example, a view
1194             #   //depot/foo/branch/... //client/branch/foo/...
1195             # will end up putting all foo/branch files into
1196             #  branch/foo/
1197             for val in self.clientSpecDirs:
1198                 if path.startswith(val[0]):
1199                     # replace the depot path with the client path
1200                     path = path.replace(val[0], val[1][1])
1201                     # now strip out the client (//client/...)
1202                     path = re.sub("^(//[^/]+/)", '', path)
1203                     # the rest is all path
1204                     return path
1205
1206         if self.keepRepoPath:
1207             prefixes = [re.sub("^(//[^/]+/).*", r'\1', prefixes[0])]
1208
1209         for p in prefixes:
1210             if p4PathStartsWith(path, p):
1211                 path = path[len(p):]
1212
1213         return path
1214
1215     def splitFilesIntoBranches(self, commit):
1216         branches = {}
1217         fnum = 0
1218         while commit.has_key("depotFile%s" % fnum):
1219             path =  commit["depotFile%s" % fnum]
1220             found = [p for p in self.depotPaths
1221                      if p4PathStartsWith(path, p)]
1222             if not found:
1223                 fnum = fnum + 1
1224                 continue
1225
1226             file = {}
1227             file["path"] = path
1228             file["rev"] = commit["rev%s" % fnum]
1229             file["action"] = commit["action%s" % fnum]
1230             file["type"] = commit["type%s" % fnum]
1231             fnum = fnum + 1
1232
1233             relPath = self.stripRepoPath(path, self.depotPaths)
1234
1235             for branch in self.knownBranches.keys():
1236
1237                 # add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.2
1238                 if relPath.startswith(branch + "/"):
1239                     if branch not in branches:
1240                         branches[branch] = []
1241                     branches[branch].append(file)
1242                     break
1243
1244         return branches
1245
1246     # output one file from the P4 stream
1247     # - helper for streamP4Files
1248
1249     def streamOneP4File(self, file, contents):
1250         relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)
1251         relPath = self.wildcard_decode(relPath)
1252         if verbose:
1253             sys.stderr.write("%s\n" % relPath)
1254
1255         (type_base, type_mods) = split_p4_type(file["type"])
1256
1257         git_mode = "100644"
1258         if "x" in type_mods:
1259             git_mode = "100755"
1260         if type_base == "symlink":
1261             git_mode = "120000"
1262             # p4 print on a symlink contains "target\n"; remove the newline
1263             data = ''.join(contents)
1264             contents = [data[:-1]]
1265
1266         if type_base == "utf16":
1267             # p4 delivers different text in the python output to -G
1268             # than it does when using "print -o", or normal p4 client
1269             # operations.  utf16 is converted to ascii or utf8, perhaps.
1270             # But ascii text saved as -t utf16 is completely mangled.
1271             # Invoke print -o to get the real contents.
1272             text = p4_read_pipe('print -q -o - "%s"' % file['depotFile'])
1273             contents = [ text ]
1274
1275         # Perhaps windows wants unicode, utf16 newlines translated too;
1276         # but this is not doing it.
1277         if self.isWindows and type_base == "text":
1278             mangled = []
1279             for data in contents:
1280                 data = data.replace("\r\n", "\n")
1281                 mangled.append(data)
1282             contents = mangled
1283
1284         # Note that we do not try to de-mangle keywords on utf16 files,
1285         # even though in theory somebody may want that.
1286         if type_base in ("text", "unicode", "binary"):
1287             if "ko" in type_mods:
1288                 text = ''.join(contents)
1289                 text = re.sub(r'\$(Id|Header):[^$]*\$', r'$\1$', text)
1290                 contents = [ text ]
1291             elif "k" in type_mods:
1292                 text = ''.join(contents)
1293                 text = re.sub(r'\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$', r'$\1$', text)
1294                 contents = [ text ]
1295
1296         self.gitStream.write("M %s inline %s\n" % (git_mode, relPath))
1297
1298         # total length...
1299         length = 0
1300         for d in contents:
1301             length = length + len(d)
1302
1303         self.gitStream.write("data %d\n" % length)
1304         for d in contents:
1305             self.gitStream.write(d)
1306         self.gitStream.write("\n")
1307
1308     def streamOneP4Deletion(self, file):
1309         relPath = self.stripRepoPath(file['path'], self.branchPrefixes)
1310         if verbose:
1311             sys.stderr.write("delete %s\n" % relPath)
1312         self.gitStream.write("D %s\n" % relPath)
1313
1314     # handle another chunk of streaming data
1315     def streamP4FilesCb(self, marshalled):
1316
1317         if marshalled.has_key('depotFile') and self.stream_have_file_info:
1318             # start of a new file - output the old one first
1319             self.streamOneP4File(self.stream_file, self.stream_contents)
1320             self.stream_file = {}
1321             self.stream_contents = []
1322             self.stream_have_file_info = False
1323
1324         # pick up the new file information... for the
1325         # 'data' field we need to append to our array
1326         for k in marshalled.keys():
1327             if k == 'data':
1328                 self.stream_contents.append(marshalled['data'])
1329             else:
1330                 self.stream_file[k] = marshalled[k]
1331
1332         self.stream_have_file_info = True
1333
1334     # Stream directly from "p4 files" into "git fast-import"
1335     def streamP4Files(self, files):
1336         filesForCommit = []
1337         filesToRead = []
1338         filesToDelete = []
1339
1340         for f in files:
1341             includeFile = True
1342             for val in self.clientSpecDirs:
1343                 if f['path'].startswith(val[0]):
1344                     if val[1][0] <= 0:
1345                         includeFile = False
1346                     break
1347
1348             if includeFile:
1349                 filesForCommit.append(f)
1350                 if f['action'] in self.delete_actions:
1351                     filesToDelete.append(f)
1352                 else:
1353                     filesToRead.append(f)
1354
1355         # deleted files...
1356         for f in filesToDelete:
1357             self.streamOneP4Deletion(f)
1358
1359         if len(filesToRead) > 0:
1360             self.stream_file = {}
1361             self.stream_contents = []
1362             self.stream_have_file_info = False
1363
1364             # curry self argument
1365             def streamP4FilesCbSelf(entry):
1366                 self.streamP4FilesCb(entry)
1367
1368             p4CmdList("-x - print",
1369                 '\n'.join(['%s#%s' % (f['path'], f['rev'])
1370                                                   for f in filesToRead]),
1371                 cb=streamP4FilesCbSelf)
1372
1373             # do the last chunk
1374             if self.stream_file.has_key('depotFile'):
1375                 self.streamOneP4File(self.stream_file, self.stream_contents)
1376
1377     def commit(self, details, files, branch, branchPrefixes, parent = ""):
1378         epoch = details["time"]
1379         author = details["user"]
1380         self.branchPrefixes = branchPrefixes
1381
1382         if self.verbose:
1383             print "commit into %s" % branch
1384
1385         # start with reading files; if that fails, we should not
1386         # create a commit.
1387         new_files = []
1388         for f in files:
1389             if [p for p in branchPrefixes if p4PathStartsWith(f['path'], p)]:
1390                 new_files.append (f)
1391             else:
1392                 sys.stderr.write("Ignoring file outside of prefix: %s\n" % f['path'])
1393
1394         self.gitStream.write("commit %s\n" % branch)
1395 #        gitStream.write("mark :%s\n" % details["change"])
1396         self.committedChanges.add(int(details["change"]))
1397         committer = ""
1398         if author not in self.users:
1399             self.getUserMapFromPerforceServer()
1400         if author in self.users:
1401             committer = "%s %s %s" % (self.users[author], epoch, self.tz)
1402         else:
1403             committer = "%s <a@b> %s %s" % (author, epoch, self.tz)
1404
1405         self.gitStream.write("committer %s\n" % committer)
1406
1407         self.gitStream.write("data <<EOT\n")
1408         self.gitStream.write(details["desc"])
1409         self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s"
1410                              % (','.join (branchPrefixes), details["change"]))
1411         if len(details['options']) > 0:
1412             self.gitStream.write(": options = %s" % details['options'])
1413         self.gitStream.write("]\nEOT\n\n")
1414
1415         if len(parent) > 0:
1416             if self.verbose:
1417                 print "parent %s" % parent
1418             self.gitStream.write("from %s\n" % parent)
1419
1420         self.streamP4Files(new_files)
1421         self.gitStream.write("\n")
1422
1423         change = int(details["change"])
1424
1425         if self.labels.has_key(change):
1426             label = self.labels[change]
1427             labelDetails = label[0]
1428             labelRevisions = label[1]
1429             if self.verbose:
1430                 print "Change %s is labelled %s" % (change, labelDetails)
1431
1432             files = p4CmdList("files " + ' '.join (["%s...@%s" % (p, change)
1433                                                     for p in branchPrefixes]))
1434
1435             if len(files) == len(labelRevisions):
1436
1437                 cleanedFiles = {}
1438                 for info in files:
1439                     if info["action"] in self.delete_actions:
1440                         continue
1441                     cleanedFiles[info["depotFile"]] = info["rev"]
1442
1443                 if cleanedFiles == labelRevisions:
1444                     self.gitStream.write("tag tag_%s\n" % labelDetails["label"])
1445                     self.gitStream.write("from %s\n" % branch)
1446
1447                     owner = labelDetails["Owner"]
1448                     tagger = ""
1449                     if author in self.users:
1450                         tagger = "%s %s %s" % (self.users[owner], epoch, self.tz)
1451                     else:
1452                         tagger = "%s <a@b> %s %s" % (owner, epoch, self.tz)
1453                     self.gitStream.write("tagger %s\n" % tagger)
1454                     self.gitStream.write("data <<EOT\n")
1455                     self.gitStream.write(labelDetails["Description"])
1456                     self.gitStream.write("EOT\n\n")
1457
1458                 else:
1459                     if not self.silent:
1460                         print ("Tag %s does not match with change %s: files do not match."
1461                                % (labelDetails["label"], change))
1462
1463             else:
1464                 if not self.silent:
1465                     print ("Tag %s does not match with change %s: file count is different."
1466                            % (labelDetails["label"], change))
1467
1468     def getLabels(self):
1469         self.labels = {}
1470
1471         l = p4CmdList("labels %s..." % ' '.join (self.depotPaths))
1472         if len(l) > 0 and not self.silent:
1473             print "Finding files belonging to labels in %s" % `self.depotPaths`
1474
1475         for output in l:
1476             label = output["label"]
1477             revisions = {}
1478             newestChange = 0
1479             if self.verbose:
1480                 print "Querying files for label %s" % label
1481             for file in p4CmdList("files "
1482                                   +  ' '.join (["%s...@%s" % (p, label)
1483                                                 for p in self.depotPaths])):
1484                 revisions[file["depotFile"]] = file["rev"]
1485                 change = int(file["change"])
1486                 if change > newestChange:
1487                     newestChange = change
1488
1489             self.labels[newestChange] = [output, revisions]
1490
1491         if self.verbose:
1492             print "Label changes: %s" % self.labels.keys()
1493
1494     def guessProjectName(self):
1495         for p in self.depotPaths:
1496             if p.endswith("/"):
1497                 p = p[:-1]
1498             p = p[p.strip().rfind("/") + 1:]
1499             if not p.endswith("/"):
1500                p += "/"
1501             return p
1502
1503     def getBranchMapping(self):
1504         lostAndFoundBranches = set()
1505
1506         user = gitConfig("git-p4.branchUser")
1507         if len(user) > 0:
1508             command = "branches -u %s" % user
1509         else:
1510             command = "branches"
1511
1512         for info in p4CmdList(command):
1513             details = p4Cmd("branch -o %s" % info["branch"])
1514             viewIdx = 0
1515             while details.has_key("View%s" % viewIdx):
1516                 paths = details["View%s" % viewIdx].split(" ")
1517                 viewIdx = viewIdx + 1
1518                 # require standard //depot/foo/... //depot/bar/... mapping
1519                 if len(paths) != 2 or not paths[0].endswith("/...") or not paths[1].endswith("/..."):
1520                     continue
1521                 source = paths[0]
1522                 destination = paths[1]
1523                 ## HACK
1524                 if p4PathStartsWith(source, self.depotPaths[0]) and p4PathStartsWith(destination, self.depotPaths[0]):
1525                     source = source[len(self.depotPaths[0]):-4]
1526                     destination = destination[len(self.depotPaths[0]):-4]
1527
1528                     if destination in self.knownBranches:
1529                         if not self.silent:
1530                             print "p4 branch %s defines a mapping from %s to %s" % (info["branch"], source, destination)
1531                             print "but there exists another mapping from %s to %s already!" % (self.knownBranches[destination], destination)
1532                         continue
1533
1534                     self.knownBranches[destination] = source
1535
1536                     lostAndFoundBranches.discard(destination)
1537
1538                     if source not in self.knownBranches:
1539                         lostAndFoundBranches.add(source)
1540
1541         # Perforce does not strictly require branches to be defined, so we also
1542         # check git config for a branch list.
1543         #
1544         # Example of branch definition in git config file:
1545         # [git-p4]
1546         #   branchList=main:branchA
1547         #   branchList=main:branchB
1548         #   branchList=branchA:branchC
1549         configBranches = gitConfigList("git-p4.branchList")
1550         for branch in configBranches:
1551             if branch:
1552                 (source, destination) = branch.split(":")
1553                 self.knownBranches[destination] = source
1554
1555                 lostAndFoundBranches.discard(destination)
1556
1557                 if source not in self.knownBranches:
1558                     lostAndFoundBranches.add(source)
1559
1560
1561         for branch in lostAndFoundBranches:
1562             self.knownBranches[branch] = branch
1563
1564     def getBranchMappingFromGitBranches(self):
1565         branches = p4BranchesInGit(self.importIntoRemotes)
1566         for branch in branches.keys():
1567             if branch == "master":
1568                 branch = "main"
1569             else:
1570                 branch = branch[len(self.projectName):]
1571             self.knownBranches[branch] = branch
1572
1573     def listExistingP4GitBranches(self):
1574         # branches holds mapping from name to commit
1575         branches = p4BranchesInGit(self.importIntoRemotes)
1576         self.p4BranchesInGit = branches.keys()
1577         for branch in branches.keys():
1578             self.initialParents[self.refPrefix + branch] = branches[branch]
1579
1580     def updateOptionDict(self, d):
1581         option_keys = {}
1582         if self.keepRepoPath:
1583             option_keys['keepRepoPath'] = 1
1584
1585         d["options"] = ' '.join(sorted(option_keys.keys()))
1586
1587     def readOptions(self, d):
1588         self.keepRepoPath = (d.has_key('options')
1589                              and ('keepRepoPath' in d['options']))
1590
1591     def gitRefForBranch(self, branch):
1592         if branch == "main":
1593             return self.refPrefix + "master"
1594
1595         if len(branch) <= 0:
1596             return branch
1597
1598         return self.refPrefix + self.projectName + branch
1599
1600     def gitCommitByP4Change(self, ref, change):
1601         if self.verbose:
1602             print "looking in ref " + ref + " for change %s using bisect..." % change
1603
1604         earliestCommit = ""
1605         latestCommit = parseRevision(ref)
1606
1607         while True:
1608             if self.verbose:
1609                 print "trying: earliest %s latest %s" % (earliestCommit, latestCommit)
1610             next = read_pipe("git rev-list --bisect %s %s" % (latestCommit, earliestCommit)).strip()
1611             if len(next) == 0:
1612                 if self.verbose:
1613                     print "argh"
1614                 return ""
1615             log = extractLogMessageFromGitCommit(next)
1616             settings = extractSettingsGitLog(log)
1617             currentChange = int(settings['change'])
1618             if self.verbose:
1619                 print "current change %s" % currentChange
1620
1621             if currentChange == change:
1622                 if self.verbose:
1623                     print "found %s" % next
1624                 return next
1625
1626             if currentChange < change:
1627                 earliestCommit = "^%s" % next
1628             else:
1629                 latestCommit = "%s" % next
1630
1631         return ""
1632
1633     def importNewBranch(self, branch, maxChange):
1634         # make fast-import flush all changes to disk and update the refs using the checkpoint
1635         # command so that we can try to find the branch parent in the git history
1636         self.gitStream.write("checkpoint\n\n");
1637         self.gitStream.flush();
1638         branchPrefix = self.depotPaths[0] + branch + "/"
1639         range = "@1,%s" % maxChange
1640         #print "prefix" + branchPrefix
1641         changes = p4ChangesForPaths([branchPrefix], range)
1642         if len(changes) <= 0:
1643             return False
1644         firstChange = changes[0]
1645         #print "first change in branch: %s" % firstChange
1646         sourceBranch = self.knownBranches[branch]
1647         sourceDepotPath = self.depotPaths[0] + sourceBranch
1648         sourceRef = self.gitRefForBranch(sourceBranch)
1649         #print "source " + sourceBranch
1650
1651         branchParentChange = int(p4Cmd("changes -m 1 %s...@1,%s" % (sourceDepotPath, firstChange))["change"])
1652         #print "branch parent: %s" % branchParentChange
1653         gitParent = self.gitCommitByP4Change(sourceRef, branchParentChange)
1654         if len(gitParent) > 0:
1655             self.initialParents[self.gitRefForBranch(branch)] = gitParent
1656             #print "parent git commit: %s" % gitParent
1657
1658         self.importChanges(changes)
1659         return True
1660
1661     def importChanges(self, changes):
1662         cnt = 1
1663         for change in changes:
1664             description = p4Cmd("describe %s" % change)
1665             self.updateOptionDict(description)
1666
1667             if not self.silent:
1668                 sys.stdout.write("\rImporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
1669                 sys.stdout.flush()
1670             cnt = cnt + 1
1671
1672             try:
1673                 if self.detectBranches:
1674                     branches = self.splitFilesIntoBranches(description)
1675                     for branch in branches.keys():
1676                         ## HACK  --hwn
1677                         branchPrefix = self.depotPaths[0] + branch + "/"
1678
1679                         parent = ""
1680
1681                         filesForCommit = branches[branch]
1682
1683                         if self.verbose:
1684                             print "branch is %s" % branch
1685
1686                         self.updatedBranches.add(branch)
1687
1688                         if branch not in self.createdBranches:
1689                             self.createdBranches.add(branch)
1690                             parent = self.knownBranches[branch]
1691                             if parent == branch:
1692                                 parent = ""
1693                             else:
1694                                 fullBranch = self.projectName + branch
1695                                 if fullBranch not in self.p4BranchesInGit:
1696                                     if not self.silent:
1697                                         print("\n    Importing new branch %s" % fullBranch);
1698                                     if self.importNewBranch(branch, change - 1):
1699                                         parent = ""
1700                                         self.p4BranchesInGit.append(fullBranch)
1701                                     if not self.silent:
1702                                         print("\n    Resuming with change %s" % change);
1703
1704                                 if self.verbose:
1705                                     print "parent determined through known branches: %s" % parent
1706
1707                         branch = self.gitRefForBranch(branch)
1708                         parent = self.gitRefForBranch(parent)
1709
1710                         if self.verbose:
1711                             print "looking for initial parent for %s; current parent is %s" % (branch, parent)
1712
1713                         if len(parent) == 0 and branch in self.initialParents:
1714                             parent = self.initialParents[branch]
1715                             del self.initialParents[branch]
1716
1717                         self.commit(description, filesForCommit, branch, [branchPrefix], parent)
1718                 else:
1719                     files = self.extractFilesFromCommit(description)
1720                     self.commit(description, files, self.branch, self.depotPaths,
1721                                 self.initialParent)
1722                     self.initialParent = ""
1723             except IOError:
1724                 print self.gitError.read()
1725                 sys.exit(1)
1726
1727     def importHeadRevision(self, revision):
1728         print "Doing initial import of %s from revision %s into %s" % (' '.join(self.depotPaths), revision, self.branch)
1729
1730         details = {}
1731         details["user"] = "git perforce import user"
1732         details["desc"] = ("Initial import of %s from the state at revision %s\n"
1733                            % (' '.join(self.depotPaths), revision))
1734         details["change"] = revision
1735         newestRevision = 0
1736
1737         fileCnt = 0
1738         for info in p4CmdList("files "
1739                               +  ' '.join(["%s...%s"
1740                                            % (p, revision)
1741                                            for p in self.depotPaths])):
1742
1743             if 'code' in info and info['code'] == 'error':
1744                 sys.stderr.write("p4 returned an error: %s\n"
1745                                  % info['data'])
1746                 if info['data'].find("must refer to client") >= 0:
1747                     sys.stderr.write("This particular p4 error is misleading.\n")
1748                     sys.stderr.write("Perhaps the depot path was misspelled.\n");
1749                     sys.stderr.write("Depot path:  %s\n" % " ".join(self.depotPaths))
1750                 sys.exit(1)
1751             if 'p4ExitCode' in info:
1752                 sys.stderr.write("p4 exitcode: %s\n" % info['p4ExitCode'])
1753                 sys.exit(1)
1754
1755
1756             change = int(info["change"])
1757             if change > newestRevision:
1758                 newestRevision = change
1759
1760             if info["action"] in self.delete_actions:
1761                 # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
1762                 #fileCnt = fileCnt + 1
1763                 continue
1764
1765             for prop in ["depotFile", "rev", "action", "type" ]:
1766                 details["%s%s" % (prop, fileCnt)] = info[prop]
1767
1768             fileCnt = fileCnt + 1
1769
1770         details["change"] = newestRevision
1771
1772         # Use time from top-most change so that all git-p4 clones of
1773         # the same p4 repo have the same commit SHA1s.
1774         res = p4CmdList("describe -s %d" % newestRevision)
1775         newestTime = None
1776         for r in res:
1777             if r.has_key('time'):
1778                 newestTime = int(r['time'])
1779         if newestTime is None:
1780             die("\"describe -s\" on newest change %d did not give a time")
1781         details["time"] = newestTime
1782
1783         self.updateOptionDict(details)
1784         try:
1785             self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPaths)
1786         except IOError:
1787             print "IO error with git fast-import. Is your git version recent enough?"
1788             print self.gitError.read()
1789
1790
1791     def getClientSpec(self):
1792         specList = p4CmdList( "client -o" )
1793         temp = {}
1794         for entry in specList:
1795             for k,v in entry.iteritems():
1796                 if k.startswith("View"):
1797
1798                     # p4 has these %%1 to %%9 arguments in specs to
1799                     # reorder paths; which we can't handle (yet :)
1800                     if re.match('%%\d', v) != None:
1801                         print "Sorry, can't handle %%n arguments in client specs"
1802                         sys.exit(1)
1803
1804                     if v.startswith('"'):
1805                         start = 1
1806                     else:
1807                         start = 0
1808                     index = v.find("...")
1809
1810                     # save the "client view"; i.e the RHS of the view
1811                     # line that tells the client where to put the
1812                     # files for this view.
1813                     cv = v[index+3:].strip() # +3 to remove previous '...'
1814
1815                     # if the client view doesn't end with a
1816                     # ... wildcard, then we're going to mess up the
1817                     # output directory, so fail gracefully.
1818                     if not cv.endswith('...'):
1819                         print 'Sorry, client view in "%s" needs to end with wildcard' % (k)
1820                         sys.exit(1)
1821                     cv=cv[:-3]
1822
1823                     # now save the view; +index means included, -index
1824                     # means it should be filtered out.
1825                     v = v[start:index]
1826                     if v.startswith("-"):
1827                         v = v[1:]
1828                         include = -len(v)
1829                     else:
1830                         include = len(v)
1831
1832                     temp[v] = (include, cv)
1833
1834         self.clientSpecDirs = temp.items()
1835         self.clientSpecDirs.sort( lambda x, y: abs( y[1][0] ) - abs( x[1][0] ) )
1836
1837     def run(self, args):
1838         self.depotPaths = []
1839         self.changeRange = ""
1840         self.initialParent = ""
1841         self.previousDepotPaths = []
1842
1843         # map from branch depot path to parent branch
1844         self.knownBranches = {}
1845         self.initialParents = {}
1846         self.hasOrigin = originP4BranchesExist()
1847         if not self.syncWithOrigin:
1848             self.hasOrigin = False
1849
1850         if self.importIntoRemotes:
1851             self.refPrefix = "refs/remotes/p4/"
1852         else:
1853             self.refPrefix = "refs/heads/p4/"
1854
1855         if self.syncWithOrigin and self.hasOrigin:
1856             if not self.silent:
1857                 print "Syncing with origin first by calling git fetch origin"
1858             system("git fetch origin")
1859
1860         if len(self.branch) == 0:
1861             self.branch = self.refPrefix + "master"
1862             if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
1863                 system("git update-ref %s refs/heads/p4" % self.branch)
1864                 system("git branch -D p4");
1865             # create it /after/ importing, when master exists
1866             if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes and gitBranchExists(self.branch):
1867                 system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch))
1868
1869         if self.useClientSpec or gitConfig("git-p4.useclientspec") == "true":
1870             self.getClientSpec()
1871
1872         # TODO: should always look at previous commits,
1873         # merge with previous imports, if possible.
1874         if args == []:
1875             if self.hasOrigin:
1876                 createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent)
1877             self.listExistingP4GitBranches()
1878
1879             if len(self.p4BranchesInGit) > 1:
1880                 if not self.silent:
1881                     print "Importing from/into multiple branches"
1882                 self.detectBranches = True
1883
1884             if self.verbose:
1885                 print "branches: %s" % self.p4BranchesInGit
1886
1887             p4Change = 0
1888             for branch in self.p4BranchesInGit:
1889                 logMsg =  extractLogMessageFromGitCommit(self.refPrefix + branch)
1890
1891                 settings = extractSettingsGitLog(logMsg)
1892
1893                 self.readOptions(settings)
1894                 if (settings.has_key('depot-paths')
1895                     and settings.has_key ('change')):
1896                     change = int(settings['change']) + 1
1897                     p4Change = max(p4Change, change)
1898
1899                     depotPaths = sorted(settings['depot-paths'])
1900                     if self.previousDepotPaths == []:
1901                         self.previousDepotPaths = depotPaths
1902                     else:
1903                         paths = []
1904                         for (prev, cur) in zip(self.previousDepotPaths, depotPaths):
1905                             prev_list = prev.split("/")
1906                             cur_list = cur.split("/")
1907                             for i in range(0, min(len(cur_list), len(prev_list))):
1908                                 if cur_list[i] <> prev_list[i]:
1909                                     i = i - 1
1910                                     break
1911
1912                             paths.append ("/".join(cur_list[:i + 1]))
1913
1914                         self.previousDepotPaths = paths
1915
1916             if p4Change > 0:
1917                 self.depotPaths = sorted(self.previousDepotPaths)
1918                 self.changeRange = "@%s,#head" % p4Change
1919                 if not self.detectBranches:
1920                     self.initialParent = parseRevision(self.branch)
1921                 if not self.silent and not self.detectBranches:
1922                     print "Performing incremental import into %s git branch" % self.branch
1923
1924         if not self.branch.startswith("refs/"):
1925             self.branch = "refs/heads/" + self.branch
1926
1927         if len(args) == 0 and self.depotPaths:
1928             if not self.silent:
1929                 print "Depot paths: %s" % ' '.join(self.depotPaths)
1930         else:
1931             if self.depotPaths and self.depotPaths != args:
1932                 print ("previous import used depot path %s and now %s was specified. "
1933                        "This doesn't work!" % (' '.join (self.depotPaths),
1934                                                ' '.join (args)))
1935                 sys.exit(1)
1936
1937             self.depotPaths = sorted(args)
1938
1939         revision = ""
1940         self.users = {}
1941
1942         newPaths = []
1943         for p in self.depotPaths:
1944             if p.find("@") != -1:
1945                 atIdx = p.index("@")
1946                 self.changeRange = p[atIdx:]
1947                 if self.changeRange == "@all":
1948                     self.changeRange = ""
1949                 elif ',' not in self.changeRange:
1950                     revision = self.changeRange
1951                     self.changeRange = ""
1952                 p = p[:atIdx]
1953             elif p.find("#") != -1:
1954                 hashIdx = p.index("#")
1955                 revision = p[hashIdx:]
1956                 p = p[:hashIdx]
1957             elif self.previousDepotPaths == []:
1958                 revision = "#head"
1959
1960             p = re.sub ("\.\.\.$", "", p)
1961             if not p.endswith("/"):
1962                 p += "/"
1963
1964             newPaths.append(p)
1965
1966         self.depotPaths = newPaths
1967
1968
1969         self.loadUserMapFromCache()
1970         self.labels = {}
1971         if self.detectLabels:
1972             self.getLabels();
1973
1974         if self.detectBranches:
1975             ## FIXME - what's a P4 projectName ?
1976             self.projectName = self.guessProjectName()
1977
1978             if self.hasOrigin:
1979                 self.getBranchMappingFromGitBranches()
1980             else:
1981                 self.getBranchMapping()
1982             if self.verbose:
1983                 print "p4-git branches: %s" % self.p4BranchesInGit
1984                 print "initial parents: %s" % self.initialParents
1985             for b in self.p4BranchesInGit:
1986                 if b != "master":
1987
1988                     ## FIXME
1989                     b = b[len(self.projectName):]
1990                 self.createdBranches.add(b)
1991
1992         self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
1993
1994         importProcess = subprocess.Popen(["git", "fast-import"],
1995                                          stdin=subprocess.PIPE, stdout=subprocess.PIPE,
1996                                          stderr=subprocess.PIPE);
1997         self.gitOutput = importProcess.stdout
1998         self.gitStream = importProcess.stdin
1999         self.gitError = importProcess.stderr
2000
2001         if revision:
2002             self.importHeadRevision(revision)
2003         else:
2004             changes = []
2005
2006             if len(self.changesFile) > 0:
2007                 output = open(self.changesFile).readlines()
2008                 changeSet = set()
2009                 for line in output:
2010                     changeSet.add(int(line))
2011
2012                 for change in changeSet:
2013                     changes.append(change)
2014
2015                 changes.sort()
2016             else:
2017                 # catch "git-p4 sync" with no new branches, in a repo that
2018                 # does not have any existing git-p4 branches
2019                 if len(args) == 0 and not self.p4BranchesInGit:
2020                     die("No remote p4 branches.  Perhaps you never did \"git p4 clone\" in here.");
2021                 if self.verbose:
2022                     print "Getting p4 changes for %s...%s" % (', '.join(self.depotPaths),
2023                                                               self.changeRange)
2024                 changes = p4ChangesForPaths(self.depotPaths, self.changeRange)
2025
2026                 if len(self.maxChanges) > 0:
2027                     changes = changes[:min(int(self.maxChanges), len(changes))]
2028
2029             if len(changes) == 0:
2030                 if not self.silent:
2031                     print "No changes to import!"
2032                 return True
2033
2034             if not self.silent and not self.detectBranches:
2035                 print "Import destination: %s" % self.branch
2036
2037             self.updatedBranches = set()
2038
2039             self.importChanges(changes)
2040
2041             if not self.silent:
2042                 print ""
2043                 if len(self.updatedBranches) > 0:
2044                     sys.stdout.write("Updated branches: ")
2045                     for b in self.updatedBranches:
2046                         sys.stdout.write("%s " % b)
2047                     sys.stdout.write("\n")
2048
2049         self.gitStream.close()
2050         if importProcess.wait() != 0:
2051             die("fast-import failed: %s" % self.gitError.read())
2052         self.gitOutput.close()
2053         self.gitError.close()
2054
2055         return True
2056
2057 class P4Rebase(Command):
2058     def __init__(self):
2059         Command.__init__(self)
2060         self.options = [ ]
2061         self.description = ("Fetches the latest revision from perforce and "
2062                             + "rebases the current work (branch) against it")
2063         self.verbose = False
2064
2065     def run(self, args):
2066         sync = P4Sync()
2067         sync.run([])
2068
2069         return self.rebase()
2070
2071     def rebase(self):
2072         if os.system("git update-index --refresh") != 0:
2073             die("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.");
2074         if len(read_pipe("git diff-index HEAD --")) > 0:
2075             die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash.");
2076
2077         [upstream, settings] = findUpstreamBranchPoint()
2078         if len(upstream) == 0:
2079             die("Cannot find upstream branchpoint for rebase")
2080
2081         # the branchpoint may be p4/foo~3, so strip off the parent
2082         upstream = re.sub("~[0-9]+$", "", upstream)
2083
2084         print "Rebasing the current branch onto %s" % upstream
2085         oldHead = read_pipe("git rev-parse HEAD").strip()
2086         system("git rebase %s" % upstream)
2087         system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
2088         return True
2089
2090 class P4Clone(P4Sync):
2091     def __init__(self):
2092         P4Sync.__init__(self)
2093         self.description = "Creates a new git repository and imports from Perforce into it"
2094         self.usage = "usage: %prog [options] //depot/path[@revRange]"
2095         self.options += [
2096             optparse.make_option("--destination", dest="cloneDestination",
2097                                  action='store', default=None,
2098                                  help="where to leave result of the clone"),
2099             optparse.make_option("-/", dest="cloneExclude",
2100                                  action="append", type="string",
2101                                  help="exclude depot path"),
2102             optparse.make_option("--bare", dest="cloneBare",
2103                                  action="store_true", default=False),
2104         ]
2105         self.cloneDestination = None
2106         self.needsGit = False
2107         self.cloneBare = False
2108
2109     # This is required for the "append" cloneExclude action
2110     def ensure_value(self, attr, value):
2111         if not hasattr(self, attr) or getattr(self, attr) is None:
2112             setattr(self, attr, value)
2113         return getattr(self, attr)
2114
2115     def defaultDestination(self, args):
2116         ## TODO: use common prefix of args?
2117         depotPath = args[0]
2118         depotDir = re.sub("(@[^@]*)$", "", depotPath)
2119         depotDir = re.sub("(#[^#]*)$", "", depotDir)
2120         depotDir = re.sub(r"\.\.\.$", "", depotDir)
2121         depotDir = re.sub(r"/$", "", depotDir)
2122         return os.path.split(depotDir)[1]
2123
2124     def run(self, args):
2125         if len(args) < 1:
2126             return False
2127
2128         if self.keepRepoPath and not self.cloneDestination:
2129             sys.stderr.write("Must specify destination for --keep-path\n")
2130             sys.exit(1)
2131
2132         depotPaths = args
2133
2134         if not self.cloneDestination and len(depotPaths) > 1:
2135             self.cloneDestination = depotPaths[-1]
2136             depotPaths = depotPaths[:-1]
2137
2138         self.cloneExclude = ["/"+p for p in self.cloneExclude]
2139         for p in depotPaths:
2140             if not p.startswith("//"):
2141                 return False
2142
2143         if not self.cloneDestination:
2144             self.cloneDestination = self.defaultDestination(args)
2145
2146         print "Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination)
2147
2148         if not os.path.exists(self.cloneDestination):
2149             os.makedirs(self.cloneDestination)
2150         chdir(self.cloneDestination)
2151
2152         init_cmd = [ "git", "init" ]
2153         if self.cloneBare:
2154             init_cmd.append("--bare")
2155         subprocess.check_call(init_cmd)
2156
2157         if not P4Sync.run(self, depotPaths):
2158             return False
2159         if self.branch != "master":
2160             if self.importIntoRemotes:
2161                 masterbranch = "refs/remotes/p4/master"
2162             else:
2163                 masterbranch = "refs/heads/p4/master"
2164             if gitBranchExists(masterbranch):
2165                 system("git branch master %s" % masterbranch)
2166                 if not self.cloneBare:
2167                     system("git checkout -f")
2168             else:
2169                 print "Could not detect main branch. No checkout/master branch created."
2170
2171         return True
2172
2173 class P4Branches(Command):
2174     def __init__(self):
2175         Command.__init__(self)
2176         self.options = [ ]
2177         self.description = ("Shows the git branches that hold imports and their "
2178                             + "corresponding perforce depot paths")
2179         self.verbose = False
2180
2181     def run(self, args):
2182         if originP4BranchesExist():
2183             createOrUpdateBranchesFromOrigin()
2184
2185         cmdline = "git rev-parse --symbolic "
2186         cmdline += " --remotes"
2187
2188         for line in read_pipe_lines(cmdline):
2189             line = line.strip()
2190
2191             if not line.startswith('p4/') or line == "p4/HEAD":
2192                 continue
2193             branch = line
2194
2195             log = extractLogMessageFromGitCommit("refs/remotes/%s" % branch)
2196             settings = extractSettingsGitLog(log)
2197
2198             print "%s <= %s (%s)" % (branch, ",".join(settings["depot-paths"]), settings["change"])
2199         return True
2200
2201 class HelpFormatter(optparse.IndentedHelpFormatter):
2202     def __init__(self):
2203         optparse.IndentedHelpFormatter.__init__(self)
2204
2205     def format_description(self, description):
2206         if description:
2207             return description + "\n"
2208         else:
2209             return ""
2210
2211 def printUsage(commands):
2212     print "usage: %s <command> [options]" % sys.argv[0]
2213     print ""
2214     print "valid commands: %s" % ", ".join(commands)
2215     print ""
2216     print "Try %s <command> --help for command specific help." % sys.argv[0]
2217     print ""
2218
2219 commands = {
2220     "debug" : P4Debug,
2221     "submit" : P4Submit,
2222     "commit" : P4Submit,
2223     "sync" : P4Sync,
2224     "rebase" : P4Rebase,
2225     "clone" : P4Clone,
2226     "rollback" : P4RollBack,
2227     "branches" : P4Branches
2228 }
2229
2230
2231 def main():
2232     if len(sys.argv[1:]) == 0:
2233         printUsage(commands.keys())
2234         sys.exit(2)
2235
2236     cmd = ""
2237     cmdName = sys.argv[1]
2238     try:
2239         klass = commands[cmdName]
2240         cmd = klass()
2241     except KeyError:
2242         print "unknown command %s" % cmdName
2243         print ""
2244         printUsage(commands.keys())
2245         sys.exit(2)
2246
2247     options = cmd.options
2248     cmd.gitdir = os.environ.get("GIT_DIR", None)
2249
2250     args = sys.argv[2:]
2251
2252     if len(options) > 0:
2253         options.append(optparse.make_option("--git-dir", dest="gitdir"))
2254
2255         parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
2256                                        options,
2257                                        description = cmd.description,
2258                                        formatter = HelpFormatter())
2259
2260         (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
2261     global verbose
2262     verbose = cmd.verbose
2263     if cmd.needsGit:
2264         if cmd.gitdir == None:
2265             cmd.gitdir = os.path.abspath(".git")
2266             if not isValidGitDir(cmd.gitdir):
2267                 cmd.gitdir = read_pipe("git rev-parse --git-dir").strip()
2268                 if os.path.exists(cmd.gitdir):
2269                     cdup = read_pipe("git rev-parse --show-cdup").strip()
2270                     if len(cdup) > 0:
2271                         chdir(cdup);
2272
2273         if not isValidGitDir(cmd.gitdir):
2274             if isValidGitDir(cmd.gitdir + "/.git"):
2275                 cmd.gitdir += "/.git"
2276             else:
2277                 die("fatal: cannot locate git repository at %s" % cmd.gitdir)
2278
2279         os.environ["GIT_DIR"] = cmd.gitdir
2280
2281     if not cmd.run(args):
2282         parser.print_help()
2283
2284
2285 if __name__ == '__main__':
2286     main()