#
# git-p4.py -- A tool for bidirectional operation between a Perforce depot and git.
#
-# Author: Simon Hausmann <hausmann@kde.org>
-# Copyright: 2007 Simon Hausmann <hausmann@kde.org>
+# Author: Simon Hausmann <simon@lst.de>
+# Copyright: 2007 Simon Hausmann <simon@lst.de>
# 2007 Trolltech ASA
# License: MIT <http://www.opensource.org/licenses/mit-license.php>
#
-# TODO: * Consider making --with-origin the default, assuming that the git
-# protocol is always more efficient. (needs manual testing first :)
-#
import optparse, sys, os, marshal, popen2, subprocess, shelve
import tempfile, getopt, sha, os.path, time, platform
+import re
from sets import Set;
gitdir = os.environ.get("GIT_DIR", "")
+silent = False
+
+def write_pipe(c, str):
+ if not silent:
+ sys.stderr.write('writing pipe: %s\n' % c)
+
+ ## todo: check return status
+ pipe = os.popen(c, 'w')
+ val = pipe.write(str)
+ if pipe.close():
+ sys.stderr.write('Command failed')
+ sys.exit(1)
+
+ return val
+
+def read_pipe(c):
+ if not silent:
+ sys.stderr.write('reading pipe: %s\n' % c)
+ ## todo: check return status
+ pipe = os.popen(c, 'rb')
+ val = pipe.read()
+ if pipe.close():
+ sys.stderr.write('Command failed')
+ sys.exit(1)
+
+ return val
+
+
+def read_pipe_lines(c):
+ if not silent:
+ sys.stderr.write('reading pipe: %s\n' % c)
+ ## todo: check return status
+ pipe = os.popen(c, 'rb')
+ val = pipe.readlines()
+ if pipe.close():
+ sys.stderr.write('Command failed')
+ sys.exit(1)
+
+ return val
+
+def system(cmd):
+ if not silent:
+ sys.stderr.write("executing %s" % cmd)
+ if os.system(cmd) != 0:
+ die("command failed: %s" % cmd)
+
-def mypopen(command):
- return os.popen(command, "rb");
def p4CmdList(cmd):
cmd = "p4 -G %s" % cmd
sys.exit(1)
def currentGitBranch():
- return mypopen("git name-rev HEAD").read().split(" ")[1][:-1]
+ return read_pipe("git name-rev HEAD").split(" ")[1][:-1]
def isValidGitDir(path):
if os.path.exists(path + "/HEAD") and os.path.exists(path + "/refs") and os.path.exists(path + "/objects"):
return False
def parseRevision(ref):
- return mypopen("git rev-parse %s" % ref).read()[:-1]
-
-def system(cmd):
- if os.system(cmd) != 0:
- die("command failed: %s" % cmd)
+ return read_pipe("git rev-parse %s" % ref)[:-1]
def extractLogMessageFromGitCommit(commit):
logMessage = ""
+
+ ## fixme: title is first line of commit, not 1st paragraph.
foundTitle = False
- for log in mypopen("git cat-file commit %s" % commit).readlines():
+ for log in read_pipe_lines("git cat-file commit %s" % commit):
if not foundTitle:
if len(log) == 1:
foundTitle = True
proc = subprocess.Popen(["git", "rev-parse", branch], stderr=subprocess.PIPE, stdout=subprocess.PIPE);
return proc.wait() == 0;
+def gitConfig(key):
+ return mypopen("git config %s" % key).read()[:-1]
+
class Command:
def __init__(self):
self.usage = "usage: %prog [options]"
if self.rollbackLocalBranches:
refPrefix = "refs/heads/"
- lines = mypopen("git rev-parse --symbolic --branches").readlines()
+ lines = read_pipe_lines("git rev-parse --symbolic --branches")
else:
refPrefix = "refs/remotes/"
- lines = mypopen("git rev-parse --symbolic --remotes").readlines()
+ lines = read_pipe_lines("git rev-parse --symbolic --remotes")
for line in lines:
if self.rollbackLocalBranches or (line.startswith("p4/") and line != "p4/HEAD\n"):
optparse.make_option("--origin", dest="origin"),
optparse.make_option("--reset", action="store_true", dest="reset"),
optparse.make_option("--log-substitutions", dest="substFile"),
- optparse.make_option("--noninteractive", action="store_false"),
optparse.make_option("--dry-run", action="store_true"),
optparse.make_option("--direct", dest="directSubmit", action="store_true"),
+ optparse.make_option("--trust-me-like-a-fool", dest="trustMeLikeAFool", action="store_true"),
]
self.description = "Submit changes from git to the perforce depot."
self.usage += " [name of git branch to submit into perforce depot]"
self.firstTime = True
self.origin = ""
self.directSubmit = False
+ self.trustMeLikeAFool = False
self.logSubstitutions = {}
self.logSubstitutions["<enter description here>"] = "%log%"
def start(self):
if len(self.config) > 0 and not self.reset:
- die("Cannot start sync. Previous sync config found at %s\nIf you want to start submitting again from scratch maybe you want to call git-p4 submit --reset" % self.configFile)
+ die("Cannot start sync. Previous sync config found at %s\n"
+ "If you want to start submitting again from scratch "
+ "maybe you want to call git-p4 submit --reset" % self.configFile)
commits = []
if self.directSubmit:
commits.append("0")
else:
- for line in mypopen("git rev-list --no-merges %s..%s" % (self.origin, self.master)).readlines():
+ for line in read_pipe_lines("git rev-list --no-merges %s..%s" % (self.origin, self.master)):
commits.append(line[:-1])
commits.reverse()
return result
- def apply(self, id):
+ def applyCommit(self, id):
if self.directSubmit:
print "Applying local change in working directory/index"
diff = self.diffStatus
else:
- print "Applying %s" % (mypopen("git log --max-count=1 --pretty=oneline %s" % id).read())
- diff = mypopen("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id)).readlines()
+ print "Applying %s" % (read_pipe("git log --max-count=1 --pretty=oneline %s" % id))
+ diff = read_pipe_lines("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id))
filesToAdd = set()
filesToDelete = set()
editedFiles = set()
print "What do you want to do?"
response = "x"
while response != "s" and response != "a" and response != "w":
- response = raw_input("[s]kip this patch / [a]pply the patch forcibly and with .rej files / [w]rite the patch to a file (patch.txt) ")
+ response = raw_input("[s]kip this patch / [a]pply the patch forcibly "
+ "and with .rej files / [w]rite the patch to a file (patch.txt) ")
if response == "s":
print "Skipping! Good luck with the next patches..."
return
if len(filesToDelete):
print "The following files should be scheduled for deletion with p4 delete:"
print " ".join(filesToDelete)
- die("Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue")
+ die("Please resolve and submit the conflict manually and "
+ + "continue afterwards with git-p4 submit --continue")
elif response == "w":
system(diffcmd + " > patch.txt")
print "Patch saved to patch.txt in %s !" % self.clientPath
- die("Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue")
+ die("Please resolve and submit the conflict manually and "
+ "continue afterwards with git-p4 submit --continue")
system(applyPatchCmd)
logMessage = logMessage.replace("\n", "\n\t")
logMessage = logMessage[:-1]
- template = mypopen("p4 change -o").read()
+ template = read_pipe("p4 change -o")
if self.interactive:
submitTemplate = self.prepareLogMessage(template, logMessage)
- diff = mypopen("p4 diff -du ...").read()
+ diff = read_pipe("p4 diff -du ...")
for newFile in filesToAdd:
diff += "==== new file ====\n"
separatorLine += "\n"
response = "e"
+ if self.trustMeLikeAFool:
+ response = "y"
+
firstIteration = True
while response == "e":
if not firstIteration:
if self.directSubmit:
print "Submitting to git first"
os.chdir(self.oldWorkingDirectory)
- pipe = os.popen("git commit -a -F -", "wb")
- pipe.write(submitTemplate)
- pipe.close()
+ write_pipe("git commit -a -F -", submitTemplate)
os.chdir(self.clientPath)
- pipe = os.popen("p4 submit -i", "wb")
- pipe.write(submitTemplate)
- pipe.close()
+ write_pipe("p4 submit -i", submitTemplate)
elif response == "s":
for f in editedFiles:
system("p4 revert \"%s\"" % f);
file = open(fileName, "w+")
file.write(self.prepareLogMessage(template, logMessage))
file.close()
- print "Perforce submit template written as %s. Please review/edit and then use p4 submit -i < %s to submit directly!" % (fileName, fileName)
+ print ("Perforce submit template written as %s. "
+ + "Please review/edit and then use p4 submit -i < %s to submit directly!"
+ % (fileName, fileName))
def run(self, args):
global gitdir
if len(args) == 0:
self.master = currentGitBranch()
- if len(self.master) == 0 or not os.path.exists("%s/refs/heads/%s" % (gitdir, self.master)):
+ if len(self.master) == 0 or not gitBranchExists("refs/heads/%s" % self.master):
die("Detecting current git branch failed!")
elif len(args) == 1:
self.master = args[0]
self.oldWorkingDirectory = os.getcwd()
if self.directSubmit:
- self.diffStatus = mypopen("git diff -r --name-status HEAD").readlines()
+ self.diffStatus = read_pipe_lines("git diff -r --name-status HEAD")
if len(self.diffStatus) == 0:
print "No changes in working directory to submit."
return True
- patch = mypopen("git diff -p --binary --diff-filter=ACMRTUXB HEAD").read()
+ patch = read_pipe("git diff -p --binary --diff-filter=ACMRTUXB HEAD")
self.diffFile = gitdir + "/p4-git-diff"
f = open(self.diffFile, "wb")
f.write(patch)
commit = commits[0]
commits = commits[1:]
self.config["commits"] = commits
- self.apply(commit)
+ self.applyCommit(commit)
if not self.interactive:
break
optparse.make_option("--changesfile", dest="changesFile"),
optparse.make_option("--silent", dest="silent", action="store_true"),
optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),
- optparse.make_option("--with-origin", dest="syncWithOrigin", action="store_true"),
optparse.make_option("--verbose", dest="verbose", action="store_true"),
optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false"),
optparse.make_option("--max-changes", dest="maxChanges")
(a ... is not needed in the path p4 specification, it's added implicitly)"""
self.usage += " //depot/path[@revRange]"
-
self.silent = False
self.createdBranches = Set()
self.committedChanges = Set()
self.detectBranches = False
self.detectLabels = False
self.changesFile = ""
- self.syncWithOrigin = False
+ self.syncWithOrigin = True
self.verbose = False
self.importIntoRemotes = True
self.maxChanges = ""
self.isWindows = (platform.system() == "Windows")
+ self.depotPath = None
+
+ if gitConfig("git-p4.syncFromOrigin") == "false":
+ self.syncWithOrigin = False
def p4File(self, depotPath):
- return os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
+ return read_pipe("p4 print -q \"%s\"" % depotPath)
def extractFilesFromCommit(self, commit):
files = []
fnum = fnum + 1
return files
+ def stripRepoPath(self, path):
+ return path[len(self.depotPath):]
+
def splitFilesIntoBranches(self, commit):
branches = {}
-
fnum = 0
while commit.has_key("depotFile%s" % fnum):
path = commit["depotFile%s" % fnum]
file["type"] = commit["type%s" % fnum]
fnum = fnum + 1
- relPath = path[len(self.depotPath):]
+ relPath = self.stripRepoPath(path)
for branch in self.knownBranches.keys():
- if relPath.startswith(branch + "/"): # add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.2
+
+ # add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.2
+ if relPath.startswith(branch + "/"):
if branch not in branches:
branches[branch] = []
branches[branch].append(file)
for file in files:
path = file["path"]
if not path.startswith(branchPrefix):
- # if not silent:
# print "\nchanged files: ignoring path %s outside of branch prefix %s in change %s" % (path, branchPrefix, details["change"])
continue
rev = file["rev"]
else:
if not self.silent:
- print "Tag %s does not match with change %s: files do not match." % (labelDetails["label"], change)
+ print ("Tag %s does not match with change %s: files do not match."
+ % (labelDetails["label"], change))
else:
if not self.silent:
- print "Tag %s does not match with change %s: file count is different." % (labelDetails["label"], change)
+ print ("Tag %s does not match with change %s: file count is different."
+ % (labelDetails["label"], change))
def getUserMapFromPerforceServer(self):
if self.userMapFromPerforceServer:
else:
cmdline += " --branches"
- for line in mypopen(cmdline).readlines():
+ for line in read_pipe_lines(cmdline):
if self.importIntoRemotes and ((not line.startswith("p4/")) or line == "p4/HEAD\n"):
continue
if self.importIntoRemotes:
continue
update = False
- if not os.path.exists(gitdir + "/" + remoteHead):
+ if not gitBranchExists(remoteHead):
if self.verbose:
print "creating %s" % remoteHead
update = True
self.changeRange = ""
self.initialParent = ""
self.previousDepotPath = ""
+
# map from branch depot path to parent branch
self.knownBranches = {}
self.initialParents = {}
+ self.hasOrigin = gitBranchExists("origin")
if self.importIntoRemotes:
self.refPrefix = "refs/remotes/p4/"
else:
self.refPrefix = "refs/heads/"
- if self.syncWithOrigin:
- print "Syncing with origin first as requested by calling git fetch origin"
+ if self.syncWithOrigin and self.hasOrigin:
+ if not self.silent:
+ print "Syncing with origin first by calling git fetch origin"
system("git fetch origin")
- createP4HeadRef = False;
-
if len(self.branch) == 0:
self.branch = self.refPrefix + "master"
if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
system("git branch -D p4");
# create it /after/ importing, when master exists
if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes:
- createP4HeadRef = True
+ system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch))
if len(args) == 0:
- self.createOrUpdateBranchesFromOrigin()
+ if self.hasOrigin:
+ self.createOrUpdateBranchesFromOrigin()
self.listExistingP4GitBranches()
if len(self.p4BranchesInGit) > 1:
p4Change = 0
for branch in self.p4BranchesInGit:
- depotPath, change = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self.refPrefix + branch))
+ logMsg = extractLogMessageFromGitCommit(self.refPrefix + branch)
+ (depotPath, change) = extractDepotPathAndChangeFromGitLog(logMsg)
if self.verbose:
print "path %s change %s" % (depotPath, change)
return False
else:
if len(self.depotPath) != 0 and self.depotPath != args[0]:
- print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self.depotPath, args[0])
+ print ("previous import used depot path %s and now %s was specified. "
+ "This doesn't work!" % (self.depotPath, args[0]))
sys.exit(1)
self.depotPath = args[0]
elif len(self.previousDepotPath) == 0:
self.revision = "#head"
- if self.depotPath.endswith("..."):
- self.depotPath = self.depotPath[:-3]
-
+ self.depotPath = re.sub ("\.\.\.$", "", self.depotPath)
if not self.depotPath.endswith("/"):
self.depotPath += "/"
self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
- importProcess = subprocess.Popen(["git", "fast-import"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE);
+ importProcess = subprocess.Popen(["git", "fast-import"],
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE);
self.gitOutput = importProcess.stdout
self.gitStream = importProcess.stdin
self.gitError = importProcess.stderr
print "Doing initial import of %s from revision %s" % (self.depotPath, self.revision)
details = { "user" : "git perforce import user", "time" : int(time.time()) }
- details["desc"] = "Initial import of %s from the state at revision %s" % (self.depotPath, self.revision)
+ details["desc"] = ("Initial import of %s from the state at revision %s"
+ % (self.depotPath, self.revision))
details["change"] = self.revision
newestRevision = 0
else:
if self.verbose:
print "Getting p4 changes for %s...%s" % (self.depotPath, self.changeRange)
- output = mypopen("p4 changes %s...%s" % (self.depotPath, self.changeRange)).readlines()
+ output = read_pipe_lines("p4 changes %s...%s" % (self.depotPath, self.changeRange))
for line in output:
changeNum = line.split(" ")[1]
self.gitOutput.close()
self.gitError.close()
- if createP4HeadRef:
- system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch))
-
return True
class P4Rebase(Command):
def __init__(self):
Command.__init__(self)
- self.options = [ optparse.make_option("--with-origin", dest="syncWithOrigin", action="store_true") ]
- self.description = "Fetches the latest revision from perforce and rebases the current work (branch) against it"
- self.syncWithOrigin = False
+ self.options = [ ]
+ self.description = ("Fetches the latest revision from perforce and "
+ + "rebases the current work (branch) against it")
def run(self, args):
sync = P4Sync()
- sync.syncWithOrigin = self.syncWithOrigin
sync.run([])
print "Rebasing the current branch"
- oldHead = mypopen("git rev-parse HEAD").read()[:-1]
+ oldHead = read_pipe("git rev-parse HEAD")[:-1]
system("git rebase p4")
system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
return True
if len(args) < 1:
return False
depotPath = args[0]
- dir = ""
+ destination = ""
if len(args) == 2:
- dir = args[1]
+ destination = args[1]
elif len(args) > 2:
return False
if not depotPath.startswith("//"):
return False
- if len(dir) == 0:
- dir = depotPath
- atPos = dir.rfind("@")
- if atPos != -1:
- dir = dir[0:atPos]
- hashPos = dir.rfind("#")
- if hashPos != -1:
- dir = dir[0:hashPos]
+ depotDir = re.sub("(@[^@]*)$", "", depotPath)
+ depotDir = re.sub("(#[^#]*)$", "", depotDir)
+ depotDir = re.sub(r"\.\.\.$,", "", depotDir)
+ depotDir = re.sub(r"/$", "", depotDir)
- if dir.endswith("..."):
- dir = dir[:-3]
+ if not destination:
+ destination = os.path.split(depotDir)[-1]
- if dir.endswith("/"):
- dir = dir[:-1]
-
- slashPos = dir.rfind("/")
- if slashPos != -1:
- dir = dir[slashPos + 1:]
-
- print "Importing from %s into %s" % (depotPath, dir)
- os.makedirs(dir)
- os.chdir(dir)
+ print "Importing from %s into %s" % (depotPath, destination)
+ os.makedirs(destination)
+ os.chdir(destination)
system("git init")
gitdir = os.getcwd() + "/.git"
if not P4Sync.run(self, [depotPath]):
if len(gitdir) == 0:
gitdir = ".git"
if not isValidGitDir(gitdir):
- gitdir = mypopen("git rev-parse --git-dir").read()[:-1]
+ gitdir = read_pipe("git rev-parse --git-dir")[:-1]
if os.path.exists(gitdir):
- cdup = mypopen("git rev-parse --show-cdup").read()[:-1];
+ cdup = read_pipe("git rev-parse --show-cdup")[:-1];
if len(cdup) > 0:
os.chdir(cdup);
if not cmd.run(args):
parser.print_help()
-