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\"" % |