Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Unified Diff: tools/push-to-trunk/common_includes.py

Issue 699493004: Fix push script for autoroll account. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/push-to-trunk/test_scripts.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 914599f14f737984332836ecd1780cdc97d2cefb..a555500203b340256be4bf8ecca67361441139a8 100644
--- a/tools/push-to-trunk/common_includes.py
+++ b/tools/push-to-trunk/common_includes.py
@@ -400,6 +400,9 @@ class GitTagsOnlyMixin(VCInterface):
return "origin/%s" % name
return "branch-heads/%s" % name
+ def PushRef(self, ref):
+ self.step.Git("push origin %s" % ref)
+
def Tag(self, tag, remote, message):
# Wait for the commit to appear. Assumes unique commit message titles (this
# is the case for all automated merge and push commits - also no title is
@@ -418,7 +421,7 @@ class GitTagsOnlyMixin(VCInterface):
"git updater is lagging behind?")
self.step.Git("tag %s %s" % (tag, commit))
- self.step.Git("push origin %s" % tag)
+ self.PushRef(tag)
class GitReadSvnWriteInterface(GitTagsOnlyMixin, GitSvnInterface):
@@ -436,11 +439,17 @@ class GitInterface(GitTagsOnlyMixin):
raise NotImplementedError()
def Land(self):
+ # FIXME(machenbach): This will not work with checkouts from bot_update
+ # after flag day because it will push to the cache. Investigate if it
+ # will work with "cl land".
self.step.Git("push origin")
def CLLand(self):
self.step.GitCLLand()
+ def PushRef(self, ref):
+ self.step.Git("push https://chromium.googlesource.com/v8/v8 %s" % ref)
+
VC_INTERFACES = {
"git_svn": GitSvnInterface,
@@ -726,6 +735,8 @@ class Step(GitRecipesMixin):
(root, self._config["PATCH_FILE"]),
cwd=self._options.svn):
self.Die("Could not apply patch.")
+ # Recursively add possibly newly added files.
+ self.Command("svn", "add --force %s" % root, cwd=self._options.svn)
self.Command(
"svn",
"commit --non-interactive --username=%s --config-dir=%s -m \"%s\"" %
« no previous file with comments | « no previous file | tools/push-to-trunk/test_scripts.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698