# License: MIT <http://www.opensource.org/licenses/mit-license.php>
#
-import optparse, sys, os, marshal, popen2, shelve
-import tempfile, getopt, sha, os.path, time
+import optparse, sys, os, marshal, popen2, subprocess, shelve
+import tempfile, getopt, sha, os.path, time, platform
from sets import Set;
gitdir = os.environ.get("GIT_DIR", "")
+def mypopen(command):
+ return os.popen(command, "rb");
+
def p4CmdList(cmd):
cmd = "p4 -G %s" % cmd
pipe = os.popen(cmd, "rb")
sys.exit(1)
def currentGitBranch():
- return os.popen("git name-rev HEAD").read().split(" ")[1][:-1]
+ return mypopen("git name-rev HEAD").read().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 True;
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)
def extractLogMessageFromGitCommit(commit):
logMessage = ""
foundTitle = False
- for log in os.popen("git cat-file commit %s" % commit).readlines():
+ for log in mypopen("git cat-file commit %s" % commit).readlines():
if not foundTitle:
if len(log) == 1:
foundTitle = True
return values.get("depot-path"), values.get("change")
def gitBranchExists(branch):
- if os.system("git rev-parse %s 2>/dev/null >/dev/null" % branch) == 0:
- return True
- return False
+ proc = subprocess.Popen(["git", "rev-parse", branch], stderr=subprocess.PIPE, stdout=subprocess.PIPE);
+ return proc.wait() == 0;
class Command:
def __init__(self):
print output
return True
-class P4CleanTags(Command):
- def __init__(self):
- Command.__init__(self)
- self.options = [
-# optparse.make_option("--branch", dest="branch", default="refs/heads/master")
- ]
- self.description = "A tool to remove stale unused tags from incremental perforce imports."
- def run(self, args):
- branch = currentGitBranch()
- print "Cleaning out stale p4 import tags..."
- sout, sin, serr = popen2.popen3("git name-rev --tags `git rev-parse %s`" % branch)
- output = sout.read()
- try:
- tagIdx = output.index(" tags/p4/")
- except:
- print "Cannot find any p4/* tag. Nothing to do."
- sys.exit(0)
-
- try:
- caretIdx = output.index("^")
- except:
- caretIdx = len(output) - 1
- rev = int(output[tagIdx + 9 : caretIdx])
-
- allTags = os.popen("git tag -l p4/").readlines()
- for i in range(len(allTags)):
- allTags[i] = int(allTags[i][3:-1])
-
- allTags.sort()
-
- allTags.remove(rev)
-
- for rev in allTags:
- print os.popen("git tag -d p4/%s" % rev).read()
-
- print "%s tags removed." % len(allTags)
- return True
-
class P4Submit(Command):
def __init__(self):
Command.__init__(self)
def start(self):
if len(self.config) > 0 and not self.reset:
- die("Cannot start sync. Previous sync config found at %s" % self.configFile)
+ 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)
commits = []
- for line in os.popen("git rev-list --no-merges %s..%s" % (self.origin, self.master)).readlines():
+ for line in mypopen("git rev-list --no-merges %s..%s" % (self.origin, self.master)).readlines():
commits.append(line[:-1])
commits.reverse()
return result
def apply(self, id):
- print "Applying %s" % (os.popen("git log --max-count=1 --pretty=oneline %s" % id).read())
- diff = os.popen("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id)).readlines()
+ 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()
filesToAdd = set()
filesToDelete = set()
+ editedFiles = set()
for line in diff:
modifier = line[0]
path = line[1:].strip()
if modifier == "M":
- system("p4 edit %s" % path)
+ system("p4 edit \"%s\"" % path)
+ editedFiles.add(path)
elif modifier == "A":
filesToAdd.add(path)
if path in filesToDelete:
logMessage = logMessage.replace("\n", "\n\t")
logMessage = logMessage[:-1]
- template = os.popen("p4 change -o").read()
+ template = mypopen("p4 change -o").read()
if self.interactive:
submitTemplate = self.prepareLogMessage(template, logMessage)
- diff = os.popen("p4 diff -du ...").read()
+ diff = mypopen("p4 diff -du ...").read()
for newFile in filesToAdd:
diff += "==== new file ====\n"
diff += "+" + line
f.close()
- separatorLine = "######## everything below this line is just the diff #######\n"
+ separatorLine = "######## everything below this line is just the diff #######"
+ if platform.system() == "Windows":
+ separatorLine += "\r"
+ separatorLine += "\n"
response = "e"
firstIteration = True
while response == "e":
if not firstIteration:
- response = raw_input("Do you want to submit this change? [y]es/[e]dit/[n]o ")
+ response = raw_input("Do you want to submit this change? [y]es/[e]dit/[n]o/[s]kip ")
firstIteration = False
if response == "e":
[handle, fileName] = tempfile.mkstemp()
tmpFile = os.fdopen(handle, "w+")
tmpFile.write(submitTemplate + separatorLine + diff)
tmpFile.close()
- editor = os.environ.get("EDITOR", "vi")
+ defaultEditor = "vi"
+ if platform.system() == "Windows":
+ defaultEditor = "notepad"
+ editor = os.environ.get("EDITOR", defaultEditor);
system(editor + " " + fileName)
- tmpFile = open(fileName, "r")
+ tmpFile = open(fileName, "rb")
message = tmpFile.read()
tmpFile.close()
os.remove(fileName)
print submitTemplate
raw_input("Press return to continue...")
else:
- pipe = os.popen("p4 submit -i", "w")
+ pipe = os.popen("p4 submit -i", "wb")
pipe.write(submitTemplate)
pipe.close()
+ elif response == "s":
+ for f in editedFiles:
+ system("p4 revert \"%s\"" % f);
+ for f in filesToAdd:
+ system("p4 revert \"%s\"" % f);
+ system("rm %s" %f)
+ for f in filesToDelete:
+ system("p4 delete \"%s\"" % f);
+ return
else:
print "Not submitting!"
self.interactive = False
optparse.make_option("--known-branches", dest="knownBranches"),
optparse.make_option("--data-cache", dest="dataCache", action="store_true"),
optparse.make_option("--command-cache", dest="commandCache", action="store_true"),
- optparse.make_option("--detect-labels", dest="detectLabels", action="store_true")
+ optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),
+ optparse.make_option("--with-origin", dest="syncWithOrigin", action="store_true")
]
self.description = """Imports from Perforce into a git repository.\n
example:
self.detectBranches = False
self.detectLabels = False
self.changesFile = ""
- self.tagLastChange = True
+ self.syncWithOrigin = False
def p4File(self, depotPath):
return os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
fnum = 0
while commit.has_key("depotFile%s" % fnum):
path = commit["depotFile%s" % fnum]
- if not path.startswith(self.globalPrefix):
+ if not path.startswith(self.depotPath):
# if not self.silent:
- # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.globalPrefix, change)
+ # print "\nchanged files: ignoring path %s outside of %s in change %s" % (path, self.depotPath, change)
fnum = fnum + 1
continue
branches = Set()
for file in files:
- relativePath = file["path"][len(self.globalPrefix):]
+ relativePath = file["path"][len(self.depotPath):]
# strip off the filename
relativePath = relativePath[0:relativePath.rfind("/")]
sys.exit(1);
sourceLog = sourceLog[0]
- relPath = source[len(self.globalPrefix):]
+ relPath = source[len(self.depotPath):]
# strip off the filename
relPath = relPath[0:relPath.rfind("/")]
sys.exit(1);
sourceLog = sourceLog[0]
- relPath = source[len(self.globalPrefix):]
+ relPath = source[len(self.depotPath):]
# strip off the filename
relPath = relPath[0:relPath.rfind("/")]
def changeIsBranchMerge(self, sourceBranch, destinationBranch, change):
sourceFiles = {}
- for file in p4CmdList("files %s...@%s" % (self.globalPrefix + sourceBranch + "/", change)):
+ for file in p4CmdList("files %s...@%s" % (self.depotPath + sourceBranch + "/", change)):
if file["action"] == "delete":
continue
sourceFiles[file["depotFile"]] = file
destinationFiles = {}
- for file in p4CmdList("files %s...@%s" % (self.globalPrefix + destinationBranch + "/", change)):
+ for file in p4CmdList("files %s...@%s" % (self.depotPath + destinationBranch + "/", change)):
destinationFiles[file["depotFile"]] = file
for fileName in sourceFiles.keys():
def getLabels(self):
self.labels = {}
- l = p4CmdList("labels %s..." % self.globalPrefix)
+ l = p4CmdList("labels %s..." % self.depotPath)
if len(l) > 0 and not self.silent:
- print "Finding files belonging to labels in %s" % self.globalPrefix
+ print "Finding files belonging to labels in %s" % self.depotPath
for output in l:
label = output["label"]
self.labels[newestChange] = [output, revisions]
def run(self, args):
- self.globalPrefix = ""
+ self.depotPath = ""
self.changeRange = ""
self.initialParent = ""
+ self.previousDepotPath = ""
+ # importing into default remotes/p4/* layout?
+ defaultImport = False
+
+ if self.syncWithOrigin and gitBranchExists("origin") and gitBranchExists("refs/remotes/p4/master"):
+ print "Syncing with origin first as requested by calling git fetch origin"
+ system("git fetch origin")
+ [originPreviousDepotPath, originP4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("origin"))
+ [p4PreviousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("p4"))
+ if len(originPreviousDepotPath) > 0 and len(originP4Change) > 0 and len(p4Change) > 0:
+ if originPreviousDepotPath == p4PreviousDepotPath:
+ originP4Change = int(originP4Change)
+ p4Change = int(p4Change)
+ if originP4Change > p4Change:
+ print "origin (%s) is newer than p4 (%s). Updating p4 branch from origin." % (originP4Change, p4Change)
+ system("git update-ref refs/remotes/p4/master origin");
+ else:
+ print "Cannot sync with origin. It was imported from %s while remotes/p4 was imported from %s" % (originPreviousDepotPath, p4PreviousDepotPath)
if len(self.branch) == 0:
- self.branch = "p4"
+ self.branch = "refs/remotes/p4/master"
+ if gitBranchExists("refs/heads/p4"):
+ system("git update-ref %s refs/heads/p4" % self.branch)
+ system("git symbolic-ref refs/remotes/p4/HEAD refs/remotes/p4/master")
+ system("git branch -D p4");
+ else:
+ defaultImport = True
if len(args) == 0:
if not gitBranchExists(self.branch) and gitBranchExists("origin"):
if not self.silent:
print "Creating %s branch in git repository based on origin" % self.branch
- system("git branch %s origin" % self.branch)
+ branch = self.branch
+ if not branch.startswith("refs"):
+ branch = "refs/heads/" + branch
+ system("git update-ref %s origin" % branch)
+ if defaultImport:
+ system("git symbolic-ref refs/remotes/p4/HEAD %s" % branch)
[self.previousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self.branch))
if len(self.previousDepotPath) > 0 and len(p4Change) > 0:
p4Change = int(p4Change) + 1
- self.globalPrefix = self.previousDepotPath
+ self.depotPath = self.previousDepotPath
self.changeRange = "@%s,#head" % p4Change
- self.initialParent = self.branch
- self.tagLastChange = False
+ self.initialParent = parseRevision(self.branch)
if not self.silent:
print "Performing incremental import into %s git branch" % self.branch
- self.branch = "refs/heads/" + self.branch
-
- if len(self.globalPrefix) == 0:
- self.globalPrefix = self.previousDepotPath = os.popen("git repo-config --get p4.depotpath").read()
+ if not self.branch.startswith("refs/"):
+ self.branch = "refs/heads/" + self.branch
- if len(self.globalPrefix) != 0:
- self.globalPrefix = self.globalPrefix[:-1]
+ if len(self.depotPath) != 0:
+ self.depotPath = self.depotPath[:-1]
- if len(args) == 0 and len(self.globalPrefix) != 0:
+ if len(args) == 0 and len(self.depotPath) != 0:
if not self.silent:
- print "Depot path: %s" % self.globalPrefix
+ print "Depot path: %s" % self.depotPath
elif len(args) != 1:
return False
else:
- if len(self.globalPrefix) != 0 and self.globalPrefix != args[0]:
- print "previous import used depot path %s and now %s was specified. this doesn't work!" % (self.globalPrefix, args[0])
+ 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])
sys.exit(1)
- self.globalPrefix = args[0]
+ self.depotPath = args[0]
self.revision = ""
self.users = {}
self.lastChange = 0
- self.initialTag = ""
- if self.globalPrefix.find("@") != -1:
- atIdx = self.globalPrefix.index("@")
- self.changeRange = self.globalPrefix[atIdx:]
+ if self.depotPath.find("@") != -1:
+ atIdx = self.depotPath.index("@")
+ self.changeRange = self.depotPath[atIdx:]
if self.changeRange == "@all":
self.changeRange = ""
elif self.changeRange.find(",") == -1:
self.revision = self.changeRange
self.changeRange = ""
- self.globalPrefix = self.globalPrefix[0:atIdx]
- elif self.globalPrefix.find("#") != -1:
- hashIdx = self.globalPrefix.index("#")
- self.revision = self.globalPrefix[hashIdx:]
- self.globalPrefix = self.globalPrefix[0:hashIdx]
+ self.depotPath = self.depotPath[0:atIdx]
+ elif self.depotPath.find("#") != -1:
+ hashIdx = self.depotPath.index("#")
+ self.revision = self.depotPath[hashIdx:]
+ self.depotPath = self.depotPath[0:hashIdx]
elif len(self.previousDepotPath) == 0:
self.revision = "#head"
- if self.globalPrefix.endswith("..."):
- self.globalPrefix = self.globalPrefix[:-3]
+ if self.depotPath.endswith("..."):
+ self.depotPath = self.depotPath[:-3]
- if not self.globalPrefix.endswith("/"):
- self.globalPrefix += "/"
+ if not self.depotPath.endswith("/"):
+ self.depotPath += "/"
self.getUserMap()
self.labels = {}
if self.detectLabels:
self.getLabels();
- if len(self.changeRange) == 0:
- try:
- sout, sin, serr = popen2.popen3("git name-rev --tags `git rev-parse %s`" % self.branch)
- output = sout.read()
- if output.endswith("\n"):
- output = output[:-1]
- tagIdx = output.index(" tags/p4/")
- caretIdx = output.find("^")
- endPos = len(output)
- if caretIdx != -1:
- endPos = caretIdx
- self.rev = int(output[tagIdx + 9 : endPos]) + 1
- self.changeRange = "@%s,#head" % self.rev
- self.initialParent = os.popen("git rev-parse %s" % self.branch).read()[:-1]
- self.initialTag = "p4/%s" % (int(self.rev) - 1)
- except:
- pass
-
self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
- importProcess = popen2.Popen3("git fast-import", capturestderr = True)
- self.gitOutput = importProcess.fromchild
- self.gitStream = importProcess.tochild
- self.gitError = importProcess.childerr
+ 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
if len(self.revision) > 0:
- print "Doing initial import of %s from revision %s" % (self.globalPrefix, self.revision)
+ 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.globalPrefix, self.revision)
+ details["desc"] = "Initial import of %s from the state at revision %s" % (self.depotPath, self.revision)
details["change"] = self.revision
newestRevision = 0
fileCnt = 0
- for info in p4CmdList("files %s...%s" % (self.globalPrefix, self.revision)):
+ for info in p4CmdList("files %s...%s" % (self.depotPath, self.revision)):
change = int(info["change"])
if change > newestRevision:
newestRevision = change
details["change"] = newestRevision
try:
- self.commit(details, self.extractFilesFromCommit(details), self.branch, self.globalPrefix)
+ self.commit(details, self.extractFilesFromCommit(details), self.branch, self.depotPath)
except IOError:
print "IO error with git fast-import. Is your git version recent enough?"
print self.gitError.read()
changes.sort()
else:
- output = os.popen("p4 changes %s...%s" % (self.globalPrefix, self.changeRange)).readlines()
+ output = mypopen("p4 changes %s...%s" % (self.depotPath, self.changeRange)).readlines()
for line in output:
changeNum = line.split(" ")[1]
if self.detectBranches:
for branch in self.branchesForCommit(files):
self.knownBranches.add(branch)
- branchPrefix = self.globalPrefix + branch + "/"
+ branchPrefix = self.depotPath + branch + "/"
filesForCommit = self.extractFilesInCommitToBranch(files, branchPrefix)
merged = "refs/heads/" + merged
self.commit(description, files, branch, branchPrefix, parent, merged)
else:
- self.commit(description, files, self.branch, self.globalPrefix, self.initialParent)
+ self.commit(description, files, self.branch, self.depotPath, self.initialParent)
self.initialParent = ""
except IOError:
print self.gitError.read()
if not self.silent:
print ""
- if self.tagLastChange:
- self.gitStream.write("reset refs/tags/p4/%s\n" % self.lastChange)
- self.gitStream.write("from %s\n\n" % self.branch);
-
self.gitStream.close()
self.gitOutput.close()
self.gitError.close()
importProcess.wait()
- os.popen("git repo-config p4.depotpath %s" % self.globalPrefix).read()
- if len(self.initialTag) > 0:
- os.popen("git tag -d %s" % self.initialTag).read()
-
return True
class P4Rebase(Command):
def __init__(self):
Command.__init__(self)
- self.options = [ ]
+ 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
def run(self, args):
sync = P4Sync()
+ sync.syncWithOrigin = self.syncWithOrigin
sync.run([])
print "Rebasing the current branch"
- oldHead = os.popen("git rev-parse HEAD").read()[:-1]
+ oldHead = mypopen("git rev-parse HEAD").read()[:-1]
system("git rebase p4")
system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
return True
self.description = "Creates a new git repository and imports from Perforce into it"
self.usage = "usage: %prog [options] //depot/path[@revRange] [directory]"
self.needsGit = False
- self.tagLastChange = False
def run(self, args):
if len(args) < 1:
commands = {
"debug" : P4Debug(),
- "clean-tags" : P4CleanTags(),
"submit" : P4Submit(),
"sync" : P4Sync(),
"rebase" : P4Rebase(),
if len(gitdir) == 0:
gitdir = ".git"
if not isValidGitDir(gitdir):
- cdup = os.popen("git rev-parse --show-cdup").read()[:-1]
- if isValidGitDir(cdup + "/" + gitdir):
- os.chdir(cdup)
+ gitdir = mypopen("git rev-parse --git-dir").read()[:-1]
+ if os.path.exists(gitdir):
+ cdup = mypopen("git rev-parse --show-cdup").read()[:-1];
+ if len(cdup) > 0:
+ os.chdir(cdup);
if not isValidGitDir(gitdir):
if isValidGitDir(gitdir + "/.git"):