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)
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 = mypopen("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 mypopen("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 mypopen("git rev-list --no-merges %s..%s" % (self.origin, self.master)).readlines():
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.syncWithOrigin = False
def p4File(self, depotPath):
return os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
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.depotPath = self.previousDepotPath
self.changeRange = "@%s,#head" % p4Change
- self.initialParent = self.branch
+ 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 not self.branch.startswith("refs/"):
+ self.branch = "refs/heads/" + self.branch
if len(self.depotPath) != 0:
self.depotPath = self.depotPath[:-1]
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 = mypopen("git rev-parse %s" % self.branch).read()[:-1]
- except:
- pass
-
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);
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 = mypopen("git rev-parse HEAD").read()[:-1]
commands = {
"debug" : P4Debug(),
- "clean-tags" : P4CleanTags(),
"submit" : P4Submit(),
"sync" : P4Sync(),
"rebase" : P4Rebase(),
gitdir = ".git"
if not isValidGitDir(gitdir):
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"):