diff --git a/ChangeLog b/ChangeLog index eafd989e51..1a090e6e97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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). diff --git a/src/version.cc b/src/version.cc index fc6266347c..91af548d5e 100644 --- a/src/version.cc +++ b/src/version.cc @@ -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.) diff --git a/tools/push-to-trunk/git_recipes.py b/tools/push-to-trunk/git_recipes.py index e8e81fc98c..fb7424f709 100644 --- a/tools/push-to-trunk/git_recipes.py +++ b/tools/push-to-trunk/git_recipes.py @@ -133,11 +133,8 @@ class GitRecipesMixin(object): 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") diff --git a/tools/push-to-trunk/push_to_trunk.py b/tools/push-to-trunk/push_to_trunk.py index 19a0d1d7d2..0ebfb9c295 100755 --- a/tools/push-to-trunk/push_to_trunk.py +++ b/tools/push-to-trunk/push_to_trunk.py @@ -267,12 +267,8 @@ 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. 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 @@ class ApplyChanges(Step): 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 @@ class PushToTrunk(ScriptsBase): SquashCommits, NewBranch, ApplyChanges, - AddChangeLog, SetVersion, CommitTrunk, SanityCheck, diff --git a/tools/push-to-trunk/test_scripts.py b/tools/push-to-trunk/test_scripts.py index 505cbda294..112efdfe29 100644 --- a/tools/push-to-trunk/test_scripts.py +++ b/tools/push-to-trunk/test_scripts.py @@ -589,8 +589,7 @@ class ScriptTest(unittest.TestCase): 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 @@ Performance and stability improvements on all platforms.""" 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 @@ Performance and stability improvements on all platforms.""" 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 @@ Performance and stability improvements on all platforms.""", commit) 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\nTBR=reviewer@chromium.org" if not manual else "" self.ExpectGit([ @@ -734,14 +710,9 @@ Performance and stability improvements on all platforms.""", commit) 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], "",