Reviewers: Jakob,
Message:
PTAL
Description:
Directly modify version file on trunk branch in push-to-trunk.
- This also shifts the push revision by one to prepare for the deprecation
of
the prepare push commit
- The version increment is still based on the bleeding_edge version.cc. This
will be changed in a follow up CL.
BUG=
Please review this at https://codereview.chromium.org/200763013/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+34, -18 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
987aa83263a5bfdb88e3c1f9f7014a92f12a5d51..fe4561016abcd8f5bf9d2c2d0c7ae372ccea4b4a
100755
--- a/tools/push-to-trunk/push_to_trunk.py
+++ b/tools/push-to-trunk/push_to_trunk.py
@@ -249,6 +249,11 @@ class StragglerCommits(Step):
self.GitCheckout("svn/bleeding_edge")
self["prepare_commit_hash"] = self.GitLog(n=1, format="%H",
grep=self["prep_commit_msg"])
+ # TODO(machenbach): Retrieve the push hash from a command-line option
or
+ # use ToT. The "prepare_commit_hash" will be deprecated along with the
+ # prepare push commit.
+ self["push_hash"] = self.GitLog(n=1, format="%H",
+
parent_hash=self["prepare_commit_hash"])
class SquashCommits(Step):
@@ -257,7 +262,7 @@ class SquashCommits(Step):
def RunStep(self):
# Instead of relying on "git rebase -i", we'll just create a diff,
because
# that's easier to automate.
- TextToFile(self.GitDiff("svn/trunk", self["prepare_commit_hash"]),
+ TextToFile(self.GitDiff("svn/trunk", self["push_hash"]),
self.Config(PATCH_FILE))
# Convert the ChangeLog entry to commit message format.
@@ -268,7 +273,7 @@ class SquashCommits(Step):
# Retrieve svn revision for showing the used bleeding edge revision in
the
# commit message.
- self["svn_revision"] =
self.GitSVNFindSVNRev(self["prepare_commit_hash"])
+ self["svn_revision"] = self.GitSVNFindSVNRev(self["push_hash"])
suffix = PUSH_MESSAGE_SUFFIX % int(self["svn_revision"])
text = MSub(r"^(Version \d+\.\d+\.\d+)$", "\\1%s" % suffix, text)
@@ -318,6 +323,9 @@ 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(self.Config(VERSION_FILE), "svn/trunk")
output = ""
for line in FileToText(self.Config(VERSION_FILE)).splitlines():
if line.startswith("#define MAJOR_VERSION"):
@@ -338,7 +346,6 @@ class CommitTrunk(Step):
MESSAGE = "Commit to local trunk branch."
def RunStep(self):
- self.GitAdd(self.Config(VERSION_FILE))
self.GitCommit(file_name = self.Config(COMMITMSG_FILE))
Command("rm", "-f %s*" % self.Config(COMMITMSG_FILE))
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
a8c79353c0f62dcab9d0384edc7e533548d2d2af..1208c52b3eb055c1cca0e2f343d6389fdebb001d
100644
--- a/tools/push-to-trunk/test_scripts.py
+++ b/tools/push-to-trunk/test_scripts.py
@@ -294,9 +294,8 @@ class ScriptTest(unittest.TestCase):
self._tmp_files.append(name)
return name
- def MakeTempVersionFile(self):
- name = self.MakeEmptyTempFile()
- with open(name, "w") as f:
+ def WriteFakeVersionFile(self):
+ with open(TEST_CONFIG[VERSION_FILE], "w") as f:
f.write(" // Some line...\n")
f.write("\n")
f.write("#define MAJOR_VERSION 3\n")
@@ -305,7 +304,6 @@ class ScriptTest(unittest.TestCase):
f.write("#define PATCH_LEVEL 0\n")
f.write(" // Some line...\n")
f.write("#define IS_CANDIDATE_VERSION 0\n")
- return name
def MakeStep(self):
"""Convenience wrapper."""
@@ -441,7 +439,8 @@ class ScriptTest(unittest.TestCase):
self.MakeStep().InitialEnvironmentChecks()
def testReadAndPersistVersion(self):
- TEST_CONFIG[VERSION_FILE] = self.MakeTempVersionFile()
+ TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
+ self.WriteFakeVersionFile()
step = self.MakeStep()
step.ReadAndPersistVersion()
self.assertEquals("3", step["major"])
@@ -471,7 +470,8 @@ class ScriptTest(unittest.TestCase):
"//\n#define BUILD_NUMBER 321\n"))
def testPrepareChangeLog(self):
- TEST_CONFIG[VERSION_FILE] = self.MakeTempVersionFile()
+ TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
+ self.WriteFakeVersionFile()
TEST_CONFIG[CHANGELOG_ENTRY_FILE] = self.MakeEmptyTempFile()
self.ExpectGit([
@@ -550,7 +550,8 @@ class ScriptTest(unittest.TestCase):
FileToText(TEST_CONFIG[CHANGELOG_ENTRY_FILE]))
def testIncrementVersion(self):
- TEST_CONFIG[VERSION_FILE] = self.MakeTempVersionFile()
+ TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
+ self.WriteFakeVersionFile()
self._state["build"] = "5"
self.ExpectReadline([
@@ -574,7 +575,7 @@ class ScriptTest(unittest.TestCase):
Git("svn find-rev hash1", "123455\n"),
])
- self._state["prepare_commit_hash"] = "hash1"
+ self._state["push_hash"] = "hash1"
self._state["date"] = "1999-11-11"
self.RunStep(PushToTrunk, SquashCommits)
@@ -618,7 +619,8 @@ Performance and stability improvements on all
platforms."""
def _PushToTrunk(self, force=False, manual=False):
TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
- TEST_CONFIG[VERSION_FILE] = self.MakeTempVersionFile()
+ TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
+ self.WriteFakeVersionFile()
TEST_CONFIG[CHANGELOG_ENTRY_FILE] = self.MakeEmptyTempFile()
TEST_CONFIG[CHANGELOG_FILE] = self.MakeEmptyTempFile()
if not os.path.exists(TEST_CONFIG[CHROMIUM]):
@@ -644,6 +646,10 @@ Performance and stability improvements on all
platforms."""
Performance and stability improvements on all platforms.\n"""
TextToFile(trunk_change_log, TEST_CONFIG[CHANGELOG_FILE])
+ def ResetToTrunk():
+ ResetChangeLog()
+ self.WriteFakeVersionFile()
+
def CheckSVNCommit():
commit = FileToText(TEST_CONFIG[COMMITMSG_FILE])
self.assertEquals(
@@ -709,15 +715,17 @@ Performance and stability improvements on all
platforms.""", commit)
Git("checkout -f svn/bleeding_edge", ""),
Git(("log -1 --format=%H --grep=\"Prepare push to trunk. "
"Now working on version 3.22.6.\""),
- "hash1\n"),
- Git("diff svn/trunk hash1", "patch content\n"),
- Git("svn find-rev hash1", "123455\n"),
+ "prep_hash\n"),
+ Git("log -1 --format=%H prep_hash^", "push_hash\n"),
+ Git("diff svn/trunk push_hash", "patch content\n"),
+ Git("svn find-rev push_hash", "123455\n"),
Git("checkout -b %s svn/trunk" % TEST_CONFIG[TRUNKBRANCH], "",
- cb=ResetChangeLog),
+ cb=ResetToTrunk),
Git("apply --index --reject \"%s\"" % TEST_CONFIG[PATCH_FILE], ""),
Git("checkout -f svn/trunk -- %s" % TEST_CONFIG[CHANGELOG_FILE], "",
cb=ResetChangeLog),
- Git("add \"%s\"" % TEST_CONFIG[VERSION_FILE], ""),
+ Git("checkout -f svn/trunk -- %s" % TEST_CONFIG[VERSION_FILE], "",
+ cb=self.WriteFakeVersionFile),
Git("commit -aF \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], "",
cb=CheckSVNCommit),
Git("svn dcommit 2>&1", "Some output\nCommitted r123456\nSome
output\n"),
@@ -877,7 +885,8 @@ Performance and stability improvements on all
platforms.""", commit)
def testMergeToBranch(self):
TEST_CONFIG[ALREADY_MERGING_SENTINEL_FILE] = self.MakeEmptyTempFile()
TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
- TEST_CONFIG[VERSION_FILE] = self.MakeTempVersionFile()
+ TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
+ self.WriteFakeVersionFile()
os.environ["EDITOR"] = "vi"
extra_patch = self.MakeEmptyTempFile()
--
--
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.
