Reviewers: tandrii,
Message:
Committed patchset #1 (id:1) manually as
6a06348bb7457d4957549a44111de07b2f646446 (presubmit successful).
Description:
Fix landing candidate pushes.
BUG=chromium:410721
LOG=n
[email protected]
TEST=script_test.py
Committed:
https://chromium.googlesource.com/v8/v8/+/6a06348bb7457d4957549a44111de07b2f646446
Please review this at https://codereview.chromium.org/725503003/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+2, -20 lines):
M tools/push-to-trunk/common_includes.py
M tools/push-to-trunk/git_recipes.py
M tools/push-to-trunk/push_to_trunk.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
21cdcf49777780a7c71d38fc63dd45d533202ee1..ac78ef8d27da7be143dd9ca483ae6e65cb6ab629
100644
--- a/tools/push-to-trunk/common_includes.py
+++ b/tools/push-to-trunk/common_includes.py
@@ -287,9 +287,6 @@ class VCInterface(object):
def RemoteBranch(self, name):
raise NotImplementedError()
- def Land(self):
- raise NotImplementedError()
-
def CLLand(self):
raise NotImplementedError()
@@ -356,9 +353,6 @@ class GitInterface(VCInterface):
self.step.Git("tag %s %s" % (tag, commit))
self.step.Git("push origin %s" % tag)
- def Land(self):
- self.step.Git("push origin")
-
def CLLand(self):
self.step.GitCLLand()
Index: tools/push-to-trunk/git_recipes.py
diff --git a/tools/push-to-trunk/git_recipes.py
b/tools/push-to-trunk/git_recipes.py
index
77ece5fb50d574074d4917c57d27ceb9f0e13ff6..cabb78a42d54dee69254a5fc729065c545694edf
100644
--- a/tools/push-to-trunk/git_recipes.py
+++ b/tools/push-to-trunk/git_recipes.py
@@ -231,10 +231,6 @@ class GitRecipesMixin(object):
def GitPresubmit(self, **kwargs):
self.Git("cl presubmit", "PRESUBMIT_TREE_CHECK=\"skip\"", **kwargs)
- def GitDCommit(self, **kwargs):
- self.Git(
- "cl dcommit -f --bypass-hooks", retry_on=lambda x: x is None,
**kwargs)
-
def GitCLLand(self, **kwargs):
self.Git(
"cl land -f --bypass-hooks", retry_on=lambda x: x is None,
**kwargs)
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
e873232d184daec9340a997099b4d12c843df950..6e821f2a0bff9b8f31c784750227ed517555aa69
100755
--- a/tools/push-to-trunk/push_to_trunk.py
+++ b/tools/push-to-trunk/push_to_trunk.py
@@ -51,11 +51,6 @@ class Preparation(Step):
self.PrepareBranch()
self.DeleteBranch(self.Config("TRUNKBRANCH"))
- # Allow directly pushing to candidates.
- if not self.Git("config --get remote.origin.push").strip():
- self.Git("config --add remote.origin.push "
- "refs/remotes/origin/candidates:refs/pending/heads/candidates")
-
class FreshBranch(Step):
MESSAGE = "Create a fresh branch."
@@ -355,7 +350,7 @@ class Land(Step):
MESSAGE = "Land the patch."
def RunStep(self):
- self.vc.Land()
+ self.vc.CLLand()
class TagRevision(Step):
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
fdb5cdc4171c0855587c460443feda50e090fcbd..bea8f3caadcb0902da5936e64b34da22ad98e4eb
100644
--- a/tools/push-to-trunk/test_scripts.py
+++ b/tools/push-to-trunk/test_scripts.py
@@ -772,9 +772,6 @@ Performance and stability improvements on all
platforms.""", commit)
Cmd("git fetch", ""),
Cmd("git branch", " branch1\n* branch2\n"),
Cmd("git branch", " branch1\n* branch2\n"),
- Cmd("git config --get remote.origin.push", ""),
- Cmd("git config --add remote.origin.push "
- "refs/remotes/origin/candidates:refs/pending/heads/candidates", ""),
Cmd(("git new-branch %s --upstream origin/master" %
TEST_CONFIG["BRANCHNAME"]),
""),
@@ -823,7 +820,7 @@ Performance and stability improvements on all
platforms.""", commit)
if manual:
expectations.append(RL("Y")) # Sanity check.
expectations += [
- Cmd("git push origin", ""),
+ Cmd("git cl land -f --bypass-hooks", ""),
Cmd("git fetch", ""),
Cmd("git log -1 --format=%H --grep="
"\"Version 3.22.5 (based on push_hash)\""
--
--
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.
