Reviewers: jarin,
Message:
PTAL
Description:
Remove old branch logic from push scripts.
The old temporary branch is not needed anymore. All scripts create a
different
branch after creating the temporary branch.
Also log a warning to track down script failures due to wrong branches.
BUG=
Please review this at https://codereview.chromium.org/266083003/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+10, -28 lines):
M tools/push-to-trunk/common_includes.py
M tools/push-to-trunk/merge_to_branch.py
M tools/push-to-trunk/push_to_trunk.py
M tools/push-to-trunk/releases.py
M tools/push-to-trunk/test_scripts.py
Index: tools/push-to-trunk/common_includes.py
diff --git a/tools/push-to-trunk/common_includes.py
b/tools/push-to-trunk/common_includes.py
index
aaa25cfa79389e68a8563b62fa873c804e03b211..a789d95ceee0aa24e954b24b6190ed0ae3ea937a
100644
--- a/tools/push-to-trunk/common_includes.py
+++ b/tools/push-to-trunk/common_includes.py
@@ -42,7 +42,6 @@ from git_recipes import GitRecipesMixin
from git_recipes import GitFailedException
PERSISTFILE_BASENAME = "PERSISTFILE_BASENAME"
-TEMP_BRANCH = "TEMP_BRANCH"
BRANCHNAME = "BRANCHNAME"
DOT_GIT_LOCATION = "DOT_GIT_LOCATION"
VERSION_FILE = "VERSION_FILE"
@@ -376,18 +375,11 @@ class Step(GitRecipesMixin):
self.GitSVNFetch()
def PrepareBranch(self):
- # Get ahold of a safe temporary branch and check it out.
- if self["current_branch"] != self._config[TEMP_BRANCH]:
- self.DeleteBranch(self._config[TEMP_BRANCH])
- self.GitCreateBranch(self._config[TEMP_BRANCH])
-
# Delete the branch that will be created later if it exists already.
self.DeleteBranch(self._config[BRANCHNAME])
def CommonCleanup(self):
self.GitCheckout(self["current_branch"])
- if self._config[TEMP_BRANCH] != self["current_branch"]:
- self.GitDeleteBranch(self._config[TEMP_BRANCH])
if self._config[BRANCHNAME] != self["current_branch"]:
self.GitDeleteBranch(self._config[BRANCHNAME])
Index: tools/push-to-trunk/merge_to_branch.py
diff --git a/tools/push-to-trunk/merge_to_branch.py
b/tools/push-to-trunk/merge_to_branch.py
index
ac02b547ad0b58ecfe9617b3a34f90f6e8212d58..bd9531fb93ad0f1094684d7d7e704e0434afa454
100755
--- a/tools/push-to-trunk/merge_to_branch.py
+++ b/tools/push-to-trunk/merge_to_branch.py
@@ -41,7 +41,6 @@ CONFIG = {
PERSISTFILE_BASENAME: "/tmp/v8-merge-to-branch-tempfile",
ALREADY_MERGING_SENTINEL_FILE:
"/tmp/v8-merge-to-branch-tempfile-already-merging",
- TEMP_BRANCH: "prepare-merge-temporary-branch-created-by-script",
DOT_GIT_LOCATION: ".git",
VERSION_FILE: "src/version.cc",
TEMPORARY_PATCH_FILE: "/tmp/v8-prepare-merge-tempfile-temporary-patch",
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
b487b0f8fafab1bde6d5b1663571de558edc68d4..c317bdc7305443d4e588e7703c89877fc0b34014
100755
--- a/tools/push-to-trunk/push_to_trunk.py
+++ b/tools/push-to-trunk/push_to_trunk.py
@@ -39,7 +39,6 @@ CONFIG = {
BRANCHNAME: "prepare-push",
TRUNKBRANCH: "trunk-push",
PERSISTFILE_BASENAME: "/tmp/v8-push-to-trunk-tempfile",
- TEMP_BRANCH: "prepare-push-temporary-branch-created-by-script",
DOT_GIT_LOCATION: ".git",
VERSION_FILE: "src/version.cc",
CHANGELOG_FILE: "ChangeLog",
@@ -58,6 +57,11 @@ class Preparation(Step):
def RunStep(self):
self.InitialEnvironmentChecks()
self.CommonPrepare()
+
+ if(self["current_branch"] == self.Config(TRUNKBRANCH)
+ or self["current_branch"] == self.Config(BRANCHNAME)):
+ print "Warning: Script started on branch %s" % self["current_branch"]
+
self.PrepareBranch()
self.DeleteBranch(self.Config(TRUNKBRANCH))
Index: tools/push-to-trunk/releases.py
diff --git a/tools/push-to-trunk/releases.py
b/tools/push-to-trunk/releases.py
index
8b1c99ac14deb6ec07792ab7a0e02b28f441cbb5..2a22b912ebf6b2530d91de26e8e8833059739e1e
100755
--- a/tools/push-to-trunk/releases.py
+++ b/tools/push-to-trunk/releases.py
@@ -25,7 +25,6 @@ CHROMIUM = "CHROMIUM"
CONFIG = {
BRANCHNAME: "retrieve-v8-releases",
- TEMP_BRANCH: "unused-branch", # TODO(machenbach): Remove from
infrastructure.
PERSISTFILE_BASENAME: "/tmp/v8-releases-tempfile",
DOT_GIT_LOCATION: ".git",
VERSION_FILE: "src/version.cc",
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
a55a9bf1afffecd59f3faa41131952bd256e6424..bc79cfd5d7b4cca480253ad4e9a7240ac7bdd772
100644
--- a/tools/push-to-trunk/test_scripts.py
+++ b/tools/push-to-trunk/test_scripts.py
@@ -53,7 +53,6 @@ TEST_CONFIG = {
BRANCHNAME: "test-prepare-push",
TRUNKBRANCH: "test-trunk-push",
PERSISTFILE_BASENAME: "/tmp/test-v8-push-to-trunk-tempfile",
- TEMP_BRANCH: "test-prepare-push-temporary-branch-created-by-script",
DOT_GIT_LOCATION: None,
VERSION_FILE: None,
CHANGELOG_FILE: None,
@@ -435,10 +434,8 @@ class ScriptTest(unittest.TestCase):
Git("status -s -uno", ""),
Git("status -s -b -uno", "## some_branch"),
Git("svn fetch", ""),
- Git("branch", " branch1\n* %s" % TEST_CONFIG[TEMP_BRANCH]),
- Git("branch -D %s" % TEST_CONFIG[TEMP_BRANCH], ""),
- Git("checkout -b %s" % TEST_CONFIG[TEMP_BRANCH], ""),
- Git("branch", ""),
+ Git("branch", " branch1\n* %s" % TEST_CONFIG[BRANCHNAME]),
+ Git("branch -D %s" % TEST_CONFIG[BRANCHNAME], ""),
])
self.ExpectReadline([RL("Y")])
self.MakeStep().CommonPrepare()
@@ -450,7 +447,7 @@ class ScriptTest(unittest.TestCase):
Git("status -s -uno", ""),
Git("status -s -b -uno", "## some_branch"),
Git("svn fetch", ""),
- Git("branch", " branch1\n* %s" % TEST_CONFIG[TEMP_BRANCH]),
+ Git("branch", " branch1\n* %s" % TEST_CONFIG[BRANCHNAME]),
])
self.ExpectReadline([RL("n")])
self.MakeStep().CommonPrepare()
@@ -462,8 +459,8 @@ class ScriptTest(unittest.TestCase):
Git("status -s -uno", ""),
Git("status -s -b -uno", "## some_branch"),
Git("svn fetch", ""),
- Git("branch", " branch1\n* %s" % TEST_CONFIG[TEMP_BRANCH]),
- Git("branch -D %s" % TEST_CONFIG[TEMP_BRANCH], None),
+ Git("branch", " branch1\n* %s" % TEST_CONFIG[BRANCHNAME]),
+ Git("branch -D %s" % TEST_CONFIG[BRANCHNAME], None),
])
self.ExpectReadline([RL("Y")])
self.MakeStep().CommonPrepare()
@@ -727,8 +724,6 @@ Performance and stability improvements on all
platforms.""", commit)
Git("status -s -b -uno", "## some_branch\n"),
Git("svn fetch", ""),
Git("branch", " branch1\n* branch2\n"),
- Git("checkout -b %s" % TEST_CONFIG[TEMP_BRANCH], ""),
- Git("branch", " branch1\n* branch2\n"),
Git("branch", " branch1\n* branch2\n"),
Git("checkout -b %s svn/bleeding_edge" %
TEST_CONFIG[BRANCHNAME], ""),
Git("svn find-rev r123455", "push_hash\n"),
@@ -761,7 +756,6 @@ Performance and stability improvements on all
platforms.""", commit)
Git("svn dcommit 2>&1", "Some output\nCommitted r123456\nSome
output\n"),
Git("svn tag 3.22.5 -m \"Tagging version 3.22.5\"", ""),
Git("checkout -f some_branch", ""),
- Git("branch -D %s" % TEST_CONFIG[TEMP_BRANCH], ""),
Git("branch -D %s" % TEST_CONFIG[BRANCHNAME], ""),
Git("branch -D %s" % TEST_CONFIG[TRUNKBRANCH], ""),
])
@@ -1063,8 +1057,6 @@ LOG=N
Git("status -s -b -uno", "## some_branch\n"),
Git("svn fetch", ""),
Git("branch", " branch1\n* branch2\n"),
- Git("checkout -b %s" % TEST_CONFIG[TEMP_BRANCH], ""),
- Git("branch", " branch1\n* branch2\n"),
Git("checkout -b %s svn/trunk" % TEST_CONFIG[BRANCHNAME], ""),
Git("log --format=%H --grep=\"Port r12345\" --reverse
svn/bleeding_edge",
"hash1\nhash2"),
@@ -1126,7 +1118,6 @@ LOG=N
"https://v8.googlecode.com/svn/tags/3.22.5.1 -m "
"\"Tagging version 3.22.5.1\""), ""),
Git("checkout -f some_branch", ""),
- Git("branch -D %s" % TEST_CONFIG[TEMP_BRANCH], ""),
Git("branch -D %s" % TEST_CONFIG[BRANCHNAME], ""),
])
@@ -1177,8 +1168,6 @@ LOG=N
Git("status -s -b -uno", "## some_branch\n"),
Git("svn fetch", ""),
Git("branch", " branch1\n* branch2\n"),
- Git("checkout -b %s" % TEST_CONFIG[TEMP_BRANCH], ""),
- Git("branch", " branch1\n* branch2\n"),
Git("checkout -b %s" % TEST_CONFIG[BRANCHNAME], ""),
Git("branch -r", " svn/3.21\n svn/3.3\n"),
Git("reset --hard svn/3.3", ""),
@@ -1236,7 +1225,6 @@ LOG=N
Git("checkout -f master", ""),
Git("branch -D %s" % TEST_CONFIG[BRANCHNAME], ""),
Git("checkout -f some_branch", ""),
- Git("branch -D %s" % TEST_CONFIG[TEMP_BRANCH], ""),
Git("branch -D %s" % TEST_CONFIG[BRANCHNAME], ""),
])
--
--
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.
