print "%s tags removed." % len(allTags)
return True
-class P4Sync(Command):
+class P4Submit(Command):
def __init__(self):
Command.__init__(self)
self.options = [
optparse.make_option("--continue", action="store_false", dest="firstTime"),
optparse.make_option("--origin", dest="origin"),
optparse.make_option("--reset", action="store_true", dest="reset"),
- optparse.make_option("--master", dest="master"),
optparse.make_option("--log-substitutions", dest="substFile"),
optparse.make_option("--noninteractive", action="store_false"),
optparse.make_option("--dry-run", action="store_true"),
- optparse.make_option("--apply-as-patch", action="store_true", dest="applyAsPatch")
]
self.description = "Submit changes from git to the perforce depot."
+ self.usage += " [name of git branch to submit into perforce depot]"
self.firstTime = True
self.reset = False
self.interactive = True
self.substFile = ""
self.firstTime = True
self.origin = ""
- self.master = ""
- self.applyAsPatch = True
self.logSubstitutions = {}
self.logSubstitutions["<enter description here>"] = "%log%"
self.config["commits"] = commits
- if not self.applyAsPatch:
- print "Creating temporary p4-sync branch from %s ..." % self.origin
- system("git checkout -f -b p4-sync %s" % self.origin)
-
def prepareLogMessage(self, template, message):
result = ""
else:
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))
- else:
- system("git diff-files --name-only -z | git update-index --remove -z --stdin")
- system("git cherry-pick --no-commit \"%s\"" % id)
+ system("git diff-tree -p --diff-filter=ACMRTUXB \"%s^\" \"%s\" | patch -p1" % (id, id))
for f in filesToAdd:
system("p4 add %s" % f)
# make gitdir absolute so we can cd out into the perforce checkout
gitdir = os.path.abspath(gitdir)
os.environ["GIT_DIR"] = gitdir
+
+ if len(args) == 0:
+ self.master = currentGitBranch()
+ if len(self.master) == 0 or not os.path.exists("%s/refs/heads/%s" % (gitdir, self.master)):
+ die("Detecting current git branch failed!")
+ elif len(args) == 1:
+ self.master = args[0]
+ else:
+ return False
+
depotPath = ""
if gitBranchExists("p4"):
[depotPath, dummy] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit("p4"))
sys.exit(128)
print "Perforce checkout for depot path %s located at %s" % (depotPath, clientPath)
+ oldWorkingDirectory = os.getcwd()
os.chdir(clientPath)
response = raw_input("Do you want to sync %s with p4 sync? (y/n) " % clientPath)
if response == "y" or response == "yes":
tokens = line[:-1].split("=")
self.logSubstitutions[tokens[0]] = tokens[1]
- if len(self.master) == 0:
- self.master = currentGitBranch()
- if len(self.master) == 0 or not os.path.exists("%s/refs/heads/%s" % (gitdir, self.master)):
- die("Detecting current git branch failed!")
-
self.check()
self.configFile = gitdir + "/p4-git-sync.cfg"
self.config = shelve.open(self.configFile, writeback=True)
print "No changes found to apply between %s and current HEAD" % self.origin
else:
print "All changes applied!"
- if not self.applyAsPatch:
- print "Deleting temporary p4-sync branch and going back to %s" % self.master
- system("git checkout %s" % self.master)
- system("git branch -D p4-sync")
- print "Cleaning out your perforce checkout by doing p4 edit ... ; p4 revert ..."
- system("p4 edit ... >/dev/null")
- system("p4 revert ... >/dev/null")
+ response = raw_input("Do you want to sync from Perforce now using git-p4 rebase (y/n)? ")
+ if response == "y" or response == "yes":
+ os.chdir(oldWorkingDirectory)
+ rebase = P4Rebase()
+ rebase.run([])
os.remove(self.configFile)
return True
-class GitSync(Command):
+class P4Sync(Command):
def __init__(self):
Command.__init__(self)
self.options = [
optparse.make_option("--changesfile", dest="changesFile"),
optparse.make_option("--silent", dest="silent", action="store_true"),
optparse.make_option("--known-branches", dest="knownBranches"),
- optparse.make_option("--cache", dest="doCache", action="store_true"),
- optparse.make_option("--command-cache", dest="commandCache", action="store_true")
+ 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")
]
self.description = """Imports from Perforce into a git repository.\n
example:
self.committedChanges = Set()
self.branch = ""
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()
if knownBranch:
continue
- for branch in knownBranches:
+ for branch in self.knownBranches:
#if relativePath.startswith(branch):
if self.isSubPathOf(relativePath, branch):
if len(branches) == 0:
def getLabels(self):
self.labels = {}
- for output in p4CmdList("labels %s..." % self.globalPrefix):
+ l = p4CmdList("labels %s..." % self.globalPrefix)
+ if len(l) > 0 and not self.silent:
+ print "Finding files belonging to labels in %s" % self.globalPrefix
+
+ for output in l:
label = output["label"]
revisions = {}
newestChange = 0
self.globalPrefix = ""
self.changeRange = ""
self.initialParent = ""
- self.tagLastChange = True
if len(self.branch) == 0:
self.branch = "p4"
self.globalPrefix += "/"
self.getUserMap()
- self.getLabels();
+ self.labels = {}
+ if self.detectLabels:
+ self.getLabels();
if len(self.changeRange) == 0:
try:
except:
pass
- self.tz = - time.timezone / 36
- tzsign = ("%s" % self.tz)[0]
- if tzsign != '+' and tzsign != '-':
- self.tz = "+" + ("%s" % self.tz)
+ self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
self.gitOutput, self.gitStream, self.gitError = popen2.popen3("git fast-import")
newestRevision = change
if info["action"] == "delete":
- fileCnt = fileCnt + 1
+ # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
+ #fileCnt = fileCnt + 1
continue
for prop in [ "depotFile", "rev", "action", "type" ]:
try:
self.commit(details, self.extractFilesFromCommit(details), self.branch, self.globalPrefix)
except IOError:
+ print "IO error with git fast-import. Is your git version recent enough?"
print self.gitError.read()
else:
if len(changes) == 0:
if not self.silent:
print "no changes to import!"
- sys.exit(1)
+ return True
cnt = 1
for change in changes:
return True
+class P4Rebase(Command):
+ def __init__(self):
+ Command.__init__(self)
+ self.options = [ ]
+ self.description = "Fetches the latest revision from perforce and rebases the current work (branch) against it"
+
+ def run(self, args):
+ sync = P4Sync()
+ sync.run([])
+ print "Rebasing the current branch"
+ oldHead = os.popen("git rev-parse HEAD").read()[:-1]
+ system("git rebase p4")
+ system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
+ return True
+
+class P4Clone(P4Sync):
+ def __init__(self):
+ P4Sync.__init__(self)
+ 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:
+ return False
+ depotPath = args[0]
+ dir = ""
+ if len(args) == 2:
+ dir = args[1]
+ elif len(args) > 2:
+ return False
+
+ if not depotPath.startswith("//"):
+ return False
+
+ if len(dir) == 0:
+ dir = depotPath
+ atPos = dir.rfind("@")
+ if atPos != -1:
+ dir = dir[0:atPos]
+ hashPos = dir.rfind("#")
+ if hashPos != -1:
+ dir = dir[0:hashPos]
+
+ if dir.endswith("..."):
+ dir = dir[:-3]
+
+ if dir.endswith("/"):
+ dir = dir[:-1]
+
+ slashPos = dir.rfind("/")
+ if slashPos != -1:
+ dir = dir[slashPos + 1:]
+
+ print "Importing from %s into %s" % (depotPath, dir)
+ os.makedirs(dir)
+ os.chdir(dir)
+ system("git init")
+ if not P4Sync.run(self, [depotPath]):
+ return False
+ os.wait()
+ if self.branch != "master":
+ system("git branch master p4")
+ system("git checkout -f")
+ return True
+
class HelpFormatter(optparse.IndentedHelpFormatter):
def __init__(self):
optparse.IndentedHelpFormatter.__init__(self)
commands = {
"debug" : P4Debug(),
"clean-tags" : P4CleanTags(),
- "submit" : P4Sync(),
- "sync" : GitSync()
+ "submit" : P4Submit(),
+ "sync" : P4Sync(),
+ "rebase" : P4Rebase(),
+ "clone" : P4Clone()
}
if len(sys.argv[1:]) == 0: