Revision: 19905
Author: [email protected]
Date: Thu Mar 13 15:48:24 2014 UTC
Log: Revert "Maintain change log file directly on trunk branch in
push-to-trunk." and related changes.
This reverts r19876, r19902 and r19903. The changes made git diff' in
push-to-trunk unusable.
[email protected]
Review URL: https://codereview.chromium.org/197313005
http://code.google.com/p/v8/source/detail?r=19905
Modified:
/branches/bleeding_edge/ChangeLog
/branches/bleeding_edge/src/version.cc
/branches/bleeding_edge/tools/push-to-trunk/git_recipes.py
/branches/bleeding_edge/tools/push-to-trunk/push_to_trunk.py
/branches/bleeding_edge/tools/push-to-trunk/test_scripts.py
=======================================
--- /branches/bleeding_edge/ChangeLog Thu Mar 13 15:14:28 2014 UTC
+++ /branches/bleeding_edge/ChangeLog Thu Mar 13 15:48:24 2014 UTC
@@ -1,20 +1,3 @@
-2014-03-13: Version 3.25.10
-
- MIPS: Fix uses of range analysis results in HChange (issue 3204).
-
- Make translation of modulus operation '--stress-opt'-proof
(Chromium
- issue 352059).
-
- Remove uses of CanBeNegative() in HMod (issue 3204).
-
- Remove uses of RangeCanInclude() in flooring division by power of 2
- (issue 3204).
-
- Fix uses of range analysis results in HChange (issue 3204).
-
- Performance and stability improvements on all platforms.
-
-
2014-03-13: Version 3.25.9
Reland "Enable Object.observe by default" again (issue 2409).
=======================================
--- /branches/bleeding_edge/src/version.cc Thu Mar 13 15:14:28 2014 UTC
+++ /branches/bleeding_edge/src/version.cc Thu Mar 13 15:48:24 2014 UTC
@@ -34,7 +34,7 @@
// system so their names cannot be changed without changing the scripts.
#define MAJOR_VERSION 3
#define MINOR_VERSION 25
-#define BUILD_NUMBER 11
+#define BUILD_NUMBER 10
#define PATCH_LEVEL 0
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/git_recipes.py Thu Mar 13
07:57:07 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/git_recipes.py Thu Mar 13
15:48:24 2014 UTC
@@ -133,11 +133,8 @@
def GitDCommit(self):
self.Git("cl dcommit -f --bypass-hooks", retry_on=lambda x: x is None)
- def GitDiff(self, loc1, loc2, exclude=None):
- exclude = exclude or []
- files = self.Git(MakeArgs(["diff", "--name-only", loc1, loc2]))
- files = filter(lambda f: f not in exclude, files.strip().splitlines())
- return self.Git(MakeArgs(["diff", loc1, loc2] + files))
+ def GitDiff(self, loc1, loc2):
+ return self.Git(MakeArgs(["diff", loc1, loc2]))
def GitPull(self):
self.Git("pull")
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/push_to_trunk.py Thu Mar 13
15:12:18 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/push_to_trunk.py Thu Mar 13
15:48:24 2014 UTC
@@ -267,12 +267,8 @@
def RunStep(self):
# Instead of relying on "git rebase -i", we'll just create a diff,
because
- # that's easier to automate. Exclude the ChangeLog file. It is not
- # maintained on bleeding edge. Changes will be added in a separate step
- # below.
- TextToFile(self.GitDiff("svn/trunk",
- self["prepare_commit_hash"],
- exclude=[self.Config(CHANGELOG_FILE)]),
+ # that's easier to automate.
+ TextToFile(self.GitDiff("svn/trunk", self["prepare_commit_hash"]),
self.Config(PATCH_FILE))
# Convert the ChangeLog entry to commit message format.
@@ -315,16 +311,6 @@
Command("rm", "-f %s*" % self.Config(PATCH_FILE))
-class AddChangeLog(Step):
- MESSAGE = "Add ChangeLog changes to trunk branch."
-
- def RunStep(self):
- changelog_entry = FileToText(self.Config(NEW_CHANGELOG_FILE))
- old_change_log = FileToText(self.Config(CHANGELOG_FILE))
- new_change_log = "%s\n\n\n%s" % (changelog_entry, old_change_log)
- TextToFile(new_change_log, self.Config(CHANGELOG_FILE))
- os.remove(self.Config(NEW_CHANGELOG_FILE))
-
class SetVersion(Step):
MESSAGE = "Set correct version for trunk."
@@ -543,7 +529,6 @@
SquashCommits,
NewBranch,
ApplyChanges,
- AddChangeLog,
SetVersion,
CommitTrunk,
SanityCheck,
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Thu Mar 13
15:12:18 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Thu Mar 13
15:48:24 2014 UTC
@@ -589,8 +589,7 @@
f.write(change_log)
self.ExpectGit([
- Git("diff --name-only svn/trunk hash1", "file1\nfile2\n"),
- Git("diff svn/trunk hash1 file1 file2", "patch content"),
+ Git("diff svn/trunk hash1", "patch content"),
Git("svn find-rev hash1", "123455\n"),
])
@@ -643,10 +642,7 @@
TEST_CONFIG[CHANGELOG_FILE] = self.MakeEmptyTempFile()
if not os.path.exists(TEST_CONFIG[CHROMIUM]):
os.makedirs(TEST_CONFIG[CHROMIUM])
- old_change_log = """1999-04-05: Version 3.22.4
-
- Performance and stability improvements on all platforms.\n"""
- TextToFile(old_change_log, TEST_CONFIG[CHANGELOG_FILE])
+ TextToFile("1999-04-05: Version 3.22.4", TEST_CONFIG[CHANGELOG_FILE])
TextToFile("Some line\n \"v8_revision\": \"123444\",\n some line",
TEST_CONFIG[DEPS_FILE])
os.environ["EDITOR"] = "vi"
@@ -663,11 +659,6 @@
version = FileToText(TEST_CONFIG[VERSION_FILE])
self.assertTrue(re.search(r"#define BUILD_NUMBER\s+6", version))
- def TrunkBranchSideEffects():
- """On 'git co -b new_branch svn/trunk', the ChangLog will be reset
to its
- original content."""
- TextToFile(old_change_log, TEST_CONFIG[CHANGELOG_FILE])
-
def CheckSVNCommit():
commit = FileToText(TEST_CONFIG[COMMITMSG_FILE])
self.assertEquals(
@@ -683,21 +674,6 @@
self.assertTrue(re.search(r"#define PATCH_LEVEL\s+0", version))
self.assertTrue(re.search(r"#define IS_CANDIDATE_VERSION\s+0",
version))
- # Check that the change log on the trunk branch got correctly
modified.
- change_log = FileToText(TEST_CONFIG[CHANGELOG_FILE])
- self.assertEquals(
-"""1999-07-31: Version 3.22.5
-
- Log text 1 (issue 321).
-
- Performance and stability improvements on all platforms.
-
-
-1999-04-05: Version 3.22.4
-
- Performance and stability improvements on all platforms.\n""",
- change_log)
-
force_flag = " -f" if not manual else ""
review_suffix = "\n\[email protected]" if not manual else ""
self.ExpectGit([
@@ -734,14 +710,9 @@
Git(("log -1 --format=%H --grep=\"Prepare push to trunk. "
"Now working on version 3.22.6.\""),
"hash1\n"),
- # The ChangeLog file will be one of the files with differences
between
- # trunk and bleeding edge.
- Git("diff --name-only svn/trunk hash1",
- "file1\n%s\nfile2\n" % TEST_CONFIG[CHANGELOG_FILE]),
- Git("diff svn/trunk hash1 file1 file2", "patch content"),
+ Git("diff svn/trunk hash1", "patch content\n"),
Git("svn find-rev hash1", "123455\n"),
- Git("checkout -b %s svn/trunk" % TEST_CONFIG[TRUNKBRANCH], "",
- cb=TrunkBranchSideEffects),
+ Git("checkout -b %s svn/trunk" % TEST_CONFIG[TRUNKBRANCH], ""),
Git("apply --index --reject \"%s\"" % TEST_CONFIG[PATCH_FILE], ""),
Git("add \"%s\"" % TEST_CONFIG[VERSION_FILE], ""),
Git("commit -aF \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], "",
--
--
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.
