result.update(entry)
return result;
+def p4Where(depotPath):
+ if not depotPath.endswith("/"):
+ depotPath += "/"
+ output = p4Cmd("where %s..." % depotPath)
+ clientPath = ""
+ if "path" in output:
+ clientPath = output.get("path")
+ elif "data" in output:
+ data = output.get("data")
+ lastSpace = data.rfind(" ")
+ clientPath = data[lastSpace + 1:]
+
+ if clientPath.endswith("..."):
+ clientPath = clientPath[:-3]
+ return clientPath
+
def die(msg):
sys.stderr.write(msg + "\n")
sys.exit(1)
def currentGitBranch():
- return os.popen("git-name-rev HEAD").read().split(" ")[1][:-1]
+ return os.popen("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 os.popen("git cat-file commit %s" % commit).readlines():
if not foundTitle:
if len(log) == 1:
foundTitle = 1
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:
+ if os.system("git rev-parse %s 2>/dev/null >/dev/null" % branch) == 0:
return True
return False
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)
+ sout, sin, serr = popen2.popen3("git name-rev --tags `git rev-parse %s`" % branch)
output = sout.read()
try:
tagIdx = output.index(" tags/p4/")
self.dryRun = False
self.substFile = ""
self.firstTime = True
- self.origin = "origin"
+ self.origin = ""
self.master = ""
self.applyAsPatch = 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 os.popen("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())
+ 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()
filesToAdd = set()
filesToDelete = set()
die("unknown modifier %s for %s" % (modifier, path))
if self.applyAsPatch:
- system("git-diff-tree -p --diff-filter=ACMRTUXB \"%s^\" \"%s\" | patch -p1" % (id, id))
+ system("git diff-tree -p --diff-filter=ACMRTUXB \"%s^\" \"%s\" | patch -p1" % (id, id))
else:
- system("git-diff-files --name-only -z | git-update-index --remove -z --stdin")
+ system("git diff-files --name-only -z | git update-index --remove -z --stdin")
system("git cherry-pick --no-commit \"%s\"" % id)
for f in filesToAdd:
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
+ # make gitdir absolute so we can cd out into the perforce checkout
+ gitdir = os.path.abspath(gitdir)
+ os.environ["GIT_DIR"] = gitdir
+ depotPath = ""
+ if gitBranchExists("p4"):
+ [depotPath, dummy] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("p4"))
+ if len(depotPath) == 0 and gitBranchExists("origin"):
+ [depotPath, dummy] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("origin"))
+
+ if len(depotPath) == 0:
+ print "Internal error: cannot locate perforce depot path from existing branches"
+ sys.exit(128)
+
+ clientPath = p4Where(depotPath)
+
+ if len(clientPath) == 0:
+ print "Error: Cannot locate perforce checkout of %s in client view" % depotPath
+ sys.exit(128)
+
+ print "Perforce checkout for depot path %s located at %s" % (depotPath, clientPath)
+ os.chdir(clientPath)
+ response = raw_input("Do you want to sync %s with p4 sync? (y/n) " % clientPath)
+ if response == "y" or response == "yes":
+ system("p4 sync ...")
+
+ if len(self.origin) == 0:
+ if gitBranchExists("p4"):
+ self.origin = "p4"
+ else:
+ self.origin = "origin"
+
if self.reset:
self.firstTime = True
if len(self.branch) == 0:
self.branch = "p4"
- 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)
-
- [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.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
+
+ 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)
+
+ [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.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.globalPrefix) == 0:
- self.globalPrefix = self.previousDepotPath = os.popen("git-repo-config --get p4.depotpath").read()
+ self.globalPrefix = self.previousDepotPath = os.popen("git repo-config --get p4.depotpath").read()
if len(self.globalPrefix) != 0:
self.globalPrefix = self.globalPrefix[:-1]
if len(self.changeRange) == 0:
try:
- sout, sin, serr = popen2.popen3("git-name-rev --tags `git-rev-parse %s`" % self.branch)
+ 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]
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.initialParent = os.popen("git rev-parse %s" % self.branch).read()[:-1]
self.initialTag = "p4/%s" % (int(self.rev) - 1)
except:
pass
if tzsign != '+' and tzsign != '-':
self.tz = "+" + ("%s" % self.tz)
- self.gitOutput, self.gitStream, self.gitError = popen2.popen3("git-fast-import")
+ self.gitOutput, self.gitStream, self.gitError = popen2.popen3("git fast-import")
if len(self.revision) > 0:
print "Doing initial import of %s from revision %s" % (self.globalPrefix, self.revision)
self.gitOutput.close()
self.gitError.close()
- os.popen("git-repo-config p4.depotpath %s" % self.globalPrefix).read()
+ 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()
if len(gitdir) == 0:
gitdir = ".git"
if not isValidGitDir(gitdir):
- cdup = os.popen("git-rev-parse --show-cdup").read()[:-1]
+ cdup = os.popen("git rev-parse --show-cdup").read()[:-1]
if isValidGitDir(cdup + "/" + gitdir):
os.chdir(cdup)