![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 6b74feeb642281e48f7c56a39545c3797495aade..cb9961a571eb8dacb43f085a803d942c83f1e245 100755 (executable)
# 2007 Trolltech ASA
# License: MIT <http://www.opensource.org/licenses/mit-license.php>
#
+# TODO: Add an option to sync/rebase to fetch and rebase from origin first.
+#
-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
self.detectBranches = False
self.detectLabels = False
self.changesFile = ""
- self.tagLastChange = True
def p4File(self, depotPath):
return os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
self.depotPath = ""
self.changeRange = ""
self.initialParent = ""
+ self.previousDepotPath = ""
+ # importing into default remotes/p4/* layout?
+ defaultImport = False
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.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.depotPath) == 0:
- self.depotPath = 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.depotPath) != 0:
self.depotPath = self.depotPath[:-1]
self.revision = ""
self.users = {}
self.lastChange = 0
- self.initialTag = ""
if self.depotPath.find("@") != -1:
atIdx = self.depotPath.index("@")
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.depotPath, self.revision)
changes.sort()
else:
- output = os.popen("p4 changes %s...%s" % (self.depotPath, self.changeRange)).readlines()
+ output = mypopen("p4 changes %s...%s" % (self.depotPath, self.changeRange)).readlines()
for line in output:
changeNum = line.split(" ")[1]
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.depotPath).read()
- if len(self.initialTag) > 0:
- os.popen("git tag -d %s" % self.initialTag).read()
-
return True
class P4Rebase(Command):
sync = P4Sync()
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"):