Automatically operate on a temporary branch, needed for cherry-pick to work when applying changes to
files that are deleted in the future. Also do some Perforce cleaning Signed-off-by: Simon Hausmann <hausmann@kde.org>
This commit is contained in:
parent
09a14fb524
commit
794a913a00
@ -97,7 +97,6 @@ def system(cmd):
|
||||
die("command failed: %s" % cmd)
|
||||
|
||||
def check():
|
||||
return
|
||||
if len(p4CmdList("opened ...")) > 0:
|
||||
die("You have files opened with perforce! Close them before starting the sync.")
|
||||
|
||||
@ -115,6 +114,9 @@ def start(config):
|
||||
|
||||
config["commits"] = commits
|
||||
|
||||
print "Creating temporary p4-sync branch from %s ..." % origin
|
||||
system("git checkout -f -b p4-sync %s" % origin)
|
||||
|
||||
# print "Cleaning index..."
|
||||
# system("git checkout -f")
|
||||
|
||||
@ -264,5 +266,11 @@ if len(commits) == 0:
|
||||
print "No changes found to apply between %s and current HEAD" % origin
|
||||
else:
|
||||
print "All changes applied!"
|
||||
print "Deleting temporary p4-sync branch and going back to %s" % master
|
||||
system("git checkout %s" % master)
|
||||
system("git branch -D p4-sync")
|
||||
print "Cleaning out your perforce checkout by doing p4 edit ... ; p4 revert -a ..."
|
||||
system("p4 edit ...")
|
||||
system("p4 revert -a ...")
|
||||
os.remove(configFile)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user