# License: MIT <http://www.opensource.org/licenses/mit-license.php>
#
-import optparse, sys, os, marshal, popen2, shelve
+import optparse, sys, os, marshal, popen2, subprocess, shelve
import tempfile, getopt, sha, os.path, time
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"):
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):
caretIdx = len(output) - 1
rev = int(output[tagIdx + 9 : caretIdx])
- allTags = os.popen("git tag -l p4/").readlines()
+ allTags = mypopen("git tag -l p4/").readlines()
for i in range(len(allTags)):
allTags[i] = int(allTags[i][3:-1])
allTags.remove(rev)
for rev in allTags:
- print os.popen("git tag -d p4/%s" % rev).read()
+ print mypopen("git tag -d p4/%s" % rev).read()
print "%s tags removed." % len(allTags)
return True
die("Cannot start sync. Previous sync config found at %s" % 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()
for line in diff:
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"
print submitTemplate
raw_input("Press return to continue...")
else:
- pipe = os.popen("p4 submit -i", "w")
+ pipe = mypopen("p4 submit -i", "w")
pipe.write(submitTemplate)
pipe.close()
else:
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.previousDepotPath
self.changeRange = "@%s,#head" % p4Change
self.initialParent = self.branch
- self.tagLastChange = False
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 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("@")
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)
+ self.initialParent = mypopen("git rev-parse %s" % self.branch).read()[:-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:
if len(gitdir) == 0:
gitdir = ".git"
if not isValidGitDir(gitdir):
- cdup = os.popen("git rev-parse --show-cdup").read()[:-1]
+ cdup = mypopen("git rev-parse --show-cdup").read()[:-1]
if isValidGitDir(cdup + "/" + gitdir):
os.chdir(cdup)