Reviewers: tandrii(chromium),
Message:
PTAL. The squashed commit from master should not introduce any changes to
the
two files. Afterwards when creating a branch from candidates again,
checking out
these files is redundant.
Description:
Fix version and changelog pushing.
BUG=chromium:451357
LOG=n
[email protected]
NOTRY=true
Please review this at https://codereview.chromium.org/872813002/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+11, -11 lines):
M tools/push-to-trunk/push_to_trunk.py
M tools/push-to-trunk/test_scripts.py
Index: tools/push-to-trunk/push_to_trunk.py
diff --git a/tools/push-to-trunk/push_to_trunk.py
b/tools/push-to-trunk/push_to_trunk.py
index
9cea6d9bcfb7b6e5fbeea782f2f2277c5fa69811..19edb2cc4601ffb448a5cb8e84521fbd3c0ce0a4
100755
--- a/tools/push-to-trunk/push_to_trunk.py
+++ b/tools/push-to-trunk/push_to_trunk.py
@@ -285,6 +285,13 @@ class ApplyChanges(Step):
def RunStep(self):
self.ApplyPatch(self.Config("PATCH_FILE"))
os.remove(self.Config("PATCH_FILE"))
+ # The change log has been modified by the patch. Reset it to the
version
+ # on trunk and apply the exact changes determined by this
PrepareChangeLog
+ # step above.
+ self.GitCheckoutFile(CHANGELOG_FILE, self.vc.RemoteCandidateBranch())
+ # The version file has been modified by the patch. Reset it to the
version
+ # on trunk.
+ self.GitCheckoutFile(VERSION_FILE, self.vc.RemoteCandidateBranch())
class CommitSquash(Step):
@@ -313,10 +320,6 @@ class AddChangeLog(Step):
MESSAGE = "Add ChangeLog changes to trunk branch."
def RunStep(self):
- # The change log has been modified by the patch. Reset it to the
version
- # on trunk and apply the exact changes determined by this
PrepareChangeLog
- # step above.
- self.GitCheckoutFile(CHANGELOG_FILE, self.vc.RemoteCandidateBranch())
changelog_entry = FileToText(self.Config("CHANGELOG_ENTRY_FILE"))
old_change_log = FileToText(os.path.join(self.default_cwd,
CHANGELOG_FILE))
new_change_log = "%s\n\n\n%s" % (changelog_entry, old_change_log)
@@ -328,9 +331,6 @@ class SetVersion(Step):
MESSAGE = "Set correct version for trunk."
def RunStep(self):
- # The version file has been modified by the patch. Reset it to the
version
- # on trunk and apply the correct version.
- self.GitCheckoutFile(VERSION_FILE, self.vc.RemoteCandidateBranch())
self.SetVersion(os.path.join(self.default_cwd, VERSION_FILE), "new_")
Index: tools/push-to-trunk/test_scripts.py
diff --git a/tools/push-to-trunk/test_scripts.py
b/tools/push-to-trunk/test_scripts.py
index
958c2672c897584ed7dafbee1f69e800d5e006cc..d601e06828ec0f04da2fe76b0422f4ecd4f7ee78
100644
--- a/tools/push-to-trunk/test_scripts.py
+++ b/tools/push-to-trunk/test_scripts.py
@@ -815,6 +815,10 @@ Performance and stability improvements on all
platforms."""
Cmd(("git new-branch %s --upstream origin/candidates" %
TEST_CONFIG["TRUNKBRANCH"]), "", cb=ResetToTrunk),
Cmd("git apply --index --reject \"%s\"" %
TEST_CONFIG["PATCH_FILE"], ""),
+ Cmd("git checkout -f origin/candidates -- ChangeLog", "",
+ cb=ResetChangeLog),
+ Cmd("git checkout -f origin/candidates -- src/version.cc", "",
+ cb=self.WriteFakeVersionFile),
Cmd("git commit -am \"%s\"" % commit_msg_squashed, ""),
]
if manual:
@@ -826,10 +830,6 @@ Performance and stability improvements on all
platforms."""
Cmd("git branch -D %s" % TEST_CONFIG["TRUNKBRANCH"], ""),
Cmd(("git new-branch %s --upstream origin/candidates" %
TEST_CONFIG["TRUNKBRANCH"]), "", cb=ResetToTrunk),
- Cmd("git checkout -f origin/candidates -- ChangeLog", "",
- cb=ResetChangeLog),
- Cmd("git checkout -f origin/candidates -- src/version.cc", "",
- cb=self.WriteFakeVersionFile),
Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "",
cb=CheckVersionCommit),
Cmd("git cl land -f --bypass-hooks", ""),
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
