proc = subprocess.Popen(["git", "rev-parse", branch], stderr=subprocess.PIPE, stdout=subprocess.PIPE);
return proc.wait() == 0;
+def gitConfig(key):
+ return mypopen("git config %s" % key).read()[:-1]
+
class Command:
def __init__(self):
self.usage = "usage: %prog [options]"
return False
maxChange = int(args[0])
+ if "p4ExitCode" in p4Cmd("changes -m 1"):
+ die("Problems executing p4");
+
if self.rollbackLocalBranches:
refPrefix = "refs/heads/"
lines = mypopen("git rev-parse --symbolic --branches").readlines()
if len(args) == 0:
self.master = currentGitBranch()
- if len(self.master) == 0 or not os.path.exists("%s/refs/heads/%s" % (gitdir, self.master)):
+ if len(self.master) == 0 or not gitBranchExists("refs/heads/%s" % self.master):
die("Detecting current git branch failed!")
elif len(args) == 1:
self.master = args[0]
optparse.make_option("--changesfile", dest="changesFile"),
optparse.make_option("--silent", dest="silent", action="store_true"),
optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"),
- optparse.make_option("--with-origin", dest="syncWithOrigin", action="store_true"),
optparse.make_option("--verbose", dest="verbose", action="store_true"),
optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false"),
optparse.make_option("--max-changes", dest="maxChanges")
self.detectBranches = False
self.detectLabels = False
self.changesFile = ""
- self.syncWithOrigin = False
+ self.syncWithOrigin = True
self.verbose = False
self.importIntoRemotes = True
self.maxChanges = ""
+ self.isWindows = (platform.system() == "Windows")
+
+ if gitConfig("git-p4.syncFromOrigin") == "false":
+ self.syncWithOrigin = False
def p4File(self, depotPath):
return os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
data = self.p4File(depotPath)
+ if self.isWindows and file["type"].endswith("text"):
+ data = data.replace("\r\n", "\n")
+
self.gitStream.write("M %s inline %s\n" % (mode, relPath))
self.gitStream.write("data %s\n" % len(data))
self.gitStream.write(data)
print "Tag %s does not match with change %s: file count is different." % (labelDetails["label"], change)
def getUserMapFromPerforceServer(self):
+ if self.userMapFromPerforceServer:
+ return
self.users = {}
for output in p4CmdList("users"):
for user in self.users.keys():
cache.write("%s\t%s\n" % (user, self.users[user]))
cache.close();
+ self.userMapFromPerforceServer = True
def loadUserMapFromCache(self):
self.users = {}
+ self.userMapFromPerforceServer = False
try:
cache = open(gitdir + "/p4-usercache.txt", "rb")
lines = cache.readlines()
self.p4BranchesInGit.append(branch)
self.initialParents[self.refPrefix + branch] = parseRevision(line[:-1])
+ def createOrUpdateBranchesFromOrigin(self):
+ if not self.silent:
+ print "Creating/updating branch(es) in %s based on origin branch(es)" % self.refPrefix
+
+ for line in mypopen("git rev-parse --symbolic --remotes"):
+ if (not line.startswith("origin/")) or line.endswith("HEAD\n"):
+ continue
+
+ headName = line[len("origin/"):-1]
+ remoteHead = self.refPrefix + headName
+ originHead = "origin/" + headName
+
+ [originPreviousDepotPath, originP4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(originHead))
+ if len(originPreviousDepotPath) == 0 or len(originP4Change) == 0:
+ continue
+
+ update = False
+ if not gitBranchExists(remoteHead):
+ if self.verbose:
+ print "creating %s" % remoteHead
+ update = True
+ else:
+ [p4PreviousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(remoteHead))
+ if len(p4Change) > 0:
+ if originPreviousDepotPath == p4PreviousDepotPath:
+ originP4Change = int(originP4Change)
+ p4Change = int(p4Change)
+ if originP4Change > p4Change:
+ print "%s (%s) is newer than %s (%s). Updating p4 branch from origin." % (originHead, originP4Change, remoteHead, p4Change)
+ update = True
+ else:
+ print "Ignoring: %s was imported from %s while %s was imported from %s" % (originHead, originPreviousDepotPath, remoteHead, p4PreviousDepotPath)
+
+ if update:
+ system("git update-ref %s %s" % (remoteHead, originHead))
+
def run(self, args):
self.depotPath = ""
self.changeRange = ""
else:
self.refPrefix = "refs/heads/"
- createP4HeadRef = False;
+ if self.syncWithOrigin:
+ if gitBranchExists("origin"):
+ if not self.silent:
+ print "Syncing with origin first by calling git fetch origin"
+ system("git fetch origin")
- if self.syncWithOrigin and gitBranchExists("origin") and gitBranchExists(self.refPrefix + "master") and not self.detectBranches and self.importIntoRemotes:
- ### needs to be ported to multi branch import
-
- 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 " + self.refPrefix + "master origin");
- else:
- print "Cannot sync with origin. It was imported from %s while remotes/p4 was imported from %s" % (originPreviousDepotPath, p4PreviousDepotPath)
+ createP4HeadRef = False;
if len(self.branch) == 0:
self.branch = self.refPrefix + "master"
if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes:
createP4HeadRef = True
- # this needs to be called after the conversion from heads/p4 to remotes/p4/master
- self.listExistingP4GitBranches()
- if len(self.p4BranchesInGit) > 1 and not self.silent:
- print "Importing from/into multiple branches"
- self.detectBranches = True
-
if len(args) == 0:
- if not gitBranchExists(self.branch) and gitBranchExists("origin") and not self.detectBranches:
- ### needs to be ported to multi branch import
+ self.createOrUpdateBranchesFromOrigin()
+ self.listExistingP4GitBranches()
+
+ if len(self.p4BranchesInGit) > 1:
if not self.silent:
- print "Creating %s branch in git repository based on origin" % self.branch
- branch = self.branch
- if not branch.startswith("refs"):
- branch = "refs/heads/" + branch
- system("git update-ref %s origin" % branch)
+ print "Importing from/into multiple branches"
+ self.detectBranches = True
if self.verbose:
print "branches: %s" % self.p4BranchesInGit
class P4Rebase(Command):
def __init__(self):
Command.__init__(self)
- self.options = [ optparse.make_option("--with-origin", dest="syncWithOrigin", action="store_true") ]
+ self.options = [ ]
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]