undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the old patch apply code from git-p4 submit.

Browse Source 
Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
Simon Hausmann 2007-04-14 16:05:54 +02:00
parent f291b4e3d4
commit 8b72ca0f76
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/fast-import/git-p4
View File

@ -170,7 +170,6 @@ class P4Submit(Command):
optparse.make_option("--log-substitutions", dest="substFile"), optparse.make_option("--log-substitutions", dest="substFile"),
optparse.make_option("--noninteractive", action="store_false"), optparse.make_option("--noninteractive", action="store_false"),
optparse.make_option("--dry-run", action="store_true"), 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.description = "Submit changes from git to the perforce depot."
self.usage += " [name of git branch to submit into perforce depot]" self.usage += " [name of git branch to submit into perforce depot]"
@ -181,7 +180,6 @@ class P4Submit(Command):
self.substFile = "" self.substFile = ""
self.firstTime = True self.firstTime = True
self.origin = "" self.origin = ""
self.applyAsPatch = True
self.logSubstitutions = {} self.logSubstitutions = {}
self.logSubstitutions["<enter description here>"] = "%log%" self.logSubstitutions["<enter description here>"] = "%log%"
@ -202,10 +200,6 @@ class P4Submit(Command):
self.config["commits"] = commits 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): def prepareLogMessage(self, template, message):
result = "" result = ""
@ -250,11 +244,7 @@ class P4Submit(Command):
else: else:
die("unknown modifier %s for %s" % (modifier, path)) 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 cherry-pick --no-commit \"%s\"" % id)
for f in filesToAdd: for f in filesToAdd:
system("p4 add %s" % f) system("p4 add %s" % f)
@ -397,13 +387,6 @@ class P4Submit(Command):
print "No changes found to apply between %s and current HEAD" % self.origin print "No changes found to apply between %s and current HEAD" % self.origin
else: else:
print "All changes applied!" 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)? ") response = raw_input("Do you want to sync from Perforce now using git-p4 rebase (y/n)? ")
if response == "y" or response == "yes": if response == "y" or response == "yes":
os.chdir(oldWorkingDirectory) os.chdir(oldWorkingDirectory)